diff --git a/src/main/java/com/bonus/boot/manager/career/controller/CareerController.java b/src/main/java/com/bonus/boot/manager/career/controller/CareerController.java index 4deb212..d8318f1 100644 --- a/src/main/java/com/bonus/boot/manager/career/controller/CareerController.java +++ b/src/main/java/com/bonus/boot/manager/career/controller/CareerController.java @@ -158,8 +158,7 @@ public class CareerController { dao.updatePDFAddress(nameList.get(i).split("-")[1],imageFiles+nameList.get(i)); String idNumber = nameList.get(i).split("-")[1]; String phone = employeeHealthCheckDao.getPersonPhoneNumber(idNumber); -// String linkPath = "http://112.31.106.186:1616/yntj/";//正式环境 - String linkPath = "http://192.168.0.14:1616/yntj";//测试环境 + String linkPath = "http://192.168.0.14:18077/yntj";//z环境 String msg = nameList.get(i).split("-")[0]+"您的体检结果已生成，请点击查看 "+linkPath; SendPhoneMessageUtil.SendPhoneMsg(phone,msg); System.out.println(phone+"职业体检结果短信发送完成"); diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index bfb5d8a..a87316d 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -8,13 +8,13 @@ server.port=18088 #\u8BBF\u95EE\u8DEF\u5F84 server.servlet.context-path=/YSpeaManager #\u6B63\u5F0F\u5E93 -#spring.datasource.url=jdbc:mysql://192.168.1.8:23342/yn_tj_appoint?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true -#spring.datasource.username=root -#spring.datasource.password=Bonus@yntj123! -#\u6D4B\u8BD5\u5E93 -spring.datasource.url=jdbc:mysql://192.168.0.14:1115/yn_tj_appoint?useSSL=false&allowMultiQueries=true&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai +spring.datasource.url=jdbc:mysql://192.168.1.8:23342/yn_tj_appoint?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true spring.datasource.username=root -spring.datasource.password=xbzadmin@szedu14! +spring.datasource.password=Bonus@yntj123! +#\u6D4B\u8BD5\u5E93 +#spring.datasource.url=jdbc:mysql://192.168.0.14:1115/yn_tj_appoint?useSSL=false&allowMultiQueries=true&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai +#spring.datasource.username=root +#spring.datasource.password=xbzadmin@szedu14! #\u672C\u5730\u5E93 #spring.datasource.url=jdbc:mysql://127.0.0.1:3306/yn_tj_appoint?useSSL=false&allowMultiQueries=true&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai #spring.datasource.username=root @@ -32,17 +32,18 @@ mybatis.mapper-locations=classpath:mappers/*/*Mapper.xml mybatis.type-aliases-package=com.bonus.boot.manager.*.entity #\u7EBF\u4E0A -#spring.redis.host=192.168.1.4 -#spring.redis.port=6379 -#spring.redis.password=Ynsmz@186redis! +spring.redis.host=192.168.1.8 +spring.redis.port=23347 +spring.redis.password=Bonus@yntj123! #\u6D4B\u8BD5 -#spring.redis.host=192.168.1.8 -#spring.redis.port=23347 -#spring.redis.password=Bonus@yntj123! +#spring.redis.host=192.168.0.14 +#spring.redis.port=2001 +#spring.redis.password=Dszbns@Redis123! #\u672C\u5730 -spring.redis.host=127.0.0.1 -spring.redis.port=6379 -spring.redis.password= + +#spring.redis.host=127.0.0.1 +#spring.redis.port=6379 +#spring.redis.password= #spring.redis.password=Ynsmz@186redis! # \u65E5\u5FD7 @@ -65,14 +66,10 @@ token.expire.seconds=7200 spring.servlet.multipart.enabled=true #\u6B63\u5F0F -#files.url=http://112.29.103.165:1616/YSpeaManager/statics -#files.path=/data/yn -#\u6D4B\u8BD5 -#files.url=http://112.29.103.165:1617/YSpeaManager/statics -#files.path=/data/yn files.url=http://112.29.103.165:1616/medicalDocumentation/statics files.path=/data/yn -#files.url=http://192.168.1.4:29100/medicalDocumentation/statics +#\u6D4B\u8BD5 +#files.url=http://192.168.0.14:18077/medicalDocumentation/statics #files.path=/data/yn #\u672C\u5730 #files.url=http://192.168.0.110:18088/YSpeaManager/statics diff --git a/src/main/resources/mappers/statistics/careeStatistcsMapper.xml b/src/main/resources/mappers/statistics/careeStatistcsMapper.xml index f313493..98e11be 100644 --- a/src/main/resources/mappers/statistics/careeStatistcsMapper.xml +++ b/src/main/resources/mappers/statistics/careeStatistcsMapper.xml @@ -59,7 +59,7 @@ FROM pm_base_phy_appont WHERE - if_cancel = '2' AND (check_content_id = "" OR check_content_id IS NULL) + if_cancel = '2' ) b ON a.id = b.user_id and a.is_active ='1' LEFT JOIN pm_phy_organization pmo ON pmo.ID = a.depart_id and pmo.IS_ACTIVE ='1' LEFT JOIN pm_base_hospital pbh ON pbh.id = b.hospital_id and pbh.is_active = '1' diff --git a/src/main/resources/static/pages/ipda/addManagement.html b/src/main/resources/static/pages/ipda/addManagement.html index bee55f4..a15d6c6 100644 --- a/src/main/resources/static/pages/ipda/addManagement.html +++ b/src/main/resources/static/pages/ipda/addManagement.html @@ -127,7 +127,6 @@ dataType: 'json', // 服务器返回数据类型 data: JSON.stringify(formData.field), //获取提交的表单字段 success: function (data) { - debugger; if (data.resMsg === "发起成功") { parent.layer.closeAll(); top.layer.close(addLoadingMsg); //再执行关闭 diff --git a/src/main/resources/static/pages/user/addUserForm.html b/src/main/resources/static/pages/user/addUserForm.html index 610be6d..855e6f1 100644 --- a/src/main/resources/static/pages/user/addUserForm.html +++ b/src/main/resources/static/pages/user/addUserForm.html @@ -403,4 +403,34 @@ } /**树的方法结束*/ + + function gethospital(form,hospitalId) { + $("#hospitalId").html(""); + $.ajax({ + type: 'post', + url: ctxPath + '/utilConnection/getHospitalSelect', + data: { + value:hospitalId + }, + async: false, + success: function (data) { + var data =data.data; + var html = ''; + for (var i = 0; i < data.length; i++) { + if (hospitalId == data[i].key) { + html += ''; + } else { + html += ''; + } + $("#hospitalId").html(html); + layui.form.render('select'); //这里就是我们要渲染的地方了 + // form.render('select' ,'combinType'); + } + }, + error: function (err) { + console.log("获取人员角色下拉列表出错：", err); + } + }); + } + \ No newline at end of file