| ruoyi-admin/src/main/resources/application-druid.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-common/ruoyi-common.iml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-framework/ruoyi-framework.iml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| smartor/src/main/java/com/smartor/domain/PatMedInhosp.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
ruoyi-admin/src/main/resources/application-druid.yml
@@ -18,16 +18,16 @@ # password: Smartor.2023 # driverClassName: com.mysql.cj.jdbc.Driver # # # 新华 url: jdbc:mysql://192.168.191.181:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: smartor password: Smartor.2023 driverClassName: com.mysql.cj.jdbc.Driver # url: jdbc:mysql://192.168.191.181:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # username: smartor # password: Smartor.2023 # driverClassName: com.mysql.cj.jdbc.Driver # # 公司云 # url: jdbc:mysql://116.62.18.175:6002/smartor_lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # username: hxsoft # password: Hxerp2000 # driverClassName: com.mysql.cj.jdbc.Driver url: jdbc:mysql://116.62.18.175:6002/smartor_lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: hxsoft password: Hxerp2000 driverClassName: com.mysql.cj.jdbc.Driver # 从库数据源 ruoyi-common/ruoyi-common.iml
@@ -95,6 +95,7 @@ <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.36" level="project" /> <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.9" level="project" /> <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" /> <orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" /> <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" /> <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" /> @@ -156,10 +157,9 @@ <orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.10" level="project" /> <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" /> <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" /> <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.41" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-test:5.3.20" level="project" /> </component> </module> </module> ruoyi-framework/ruoyi-framework.iml
@@ -114,6 +114,7 @@ <orderEntry type="library" name="Maven: xmlpull:xmlpull:1.1.3.1" level="project" /> <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.36" level="project" /> <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" /> <orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" /> <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" /> <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" /> @@ -158,7 +159,6 @@ <orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.15" level="project" /> <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" /> <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.13" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" /> <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.41" level="project" /> @@ -172,7 +172,6 @@ <orderEntry type="library" name="Maven: com.aliyun:tea:1.2.0" level="project" /> <orderEntry type="library" name="Maven: com.aliyun:tea-rpc-util:0.1.2" level="project" /> <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" /> <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" /> <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.3.0" level="project" /> <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.3.0" level="project" /> <orderEntry type="library" name="Maven: com.aliyun:tea-openapi:0.2.8" level="project" /> @@ -248,4 +247,4 @@ <orderEntry type="library" name="Maven: org.apache.axis:axis-jaxrpc:1.4" level="project" /> <orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.54" level="project" /> </component> </module> </module> smartor/src/main/java/com/smartor/domain/PatMedInhosp.java
@@ -298,10 +298,11 @@ */ @ApiModelProperty(value = "手机号") private String telcode; /** * 手机号 * 长期任务原因 */ @ApiModelProperty(value = "手机号") @ApiModelProperty(value = "长期任务原因") private String longTaskReason;
@@ -299,7 +299,7 @@ if (CollectionUtils.isNotEmpty(epai)) externalInHospPatientAddrInfo = epai2.get(0); if (CollectionUtils.isNotEmpty(epli)) externalInHospPatientLiaisonInfo = epli2.get(0); //新增患者基本信息新增或修改 addPatArchive(externalInHospPatientInfo, externalInHospPatientAddrInfo, externalInHospPatientLiaisonInfo); PatArchive patArchive = addPatArchive(externalInHospPatientInfo, externalInHospPatientAddrInfo, externalInHospPatientLiaisonInfo); PatMedInhosp patMedInhosp = new PatMedInhosp(); patMedInhosp.setInhospno(externalInHospPatientInfo.getZhuYuanHao()); @@ -317,7 +317,7 @@ patMedInhosp1.setOperatorId(JiuZhenXX.get("CaoZuoRID").toString()); patMedInhosp1.setUpdateTime(new Date()); patMedInhosp1.setUpdateTime(new Date()); patMedInhosp1.setTelcode(patArchive.getTelcode()); patMedInhosp1.setLeavehospitaldistrictcode(externalInHospPatientInfo.getDangQianBQID()); patMedInhosp1.setLeavehospitaldistrictname(externalInHospPatientInfo.getDangQianBQMC()); patMedInhosp1.setLeaveldeptname(externalInHospPatientInfo.getDangQianKSMC()); smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -217,7 +217,7 @@ </if> <if test="deptOrDistrict==2"> <if test="leavehospitaldistrictcodes != null and leavehospitaldistrictcodes.size() > 0"> AND leavehospitaldistrictcode IN AND (leavehospitaldistrictcode IN <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="(" separator="," close=")"> @@ -227,7 +227,7 @@ <if test=" leaveldeptcodes != null and leaveldeptcodes.size()>0"> OR deptcode IN <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator="," close=")"> close="))"> #{leaveldeptcode} </foreach> </if> @@ -262,6 +262,7 @@ <if test="longSendTime != null ">and long_send_time = #{longSendTime}</if> <if test="sendstate != null ">and sendstate = #{sendstate}</if> <if test="drname != null and drname != ''">and drname like concat('%', #{drname}, '%')</if> <if test="taskName != null and taskName != ''">and task_name like concat('%', #{taskName}, '%')</if> <if test="drcode != null ">and drcode = #{drcode}</if> <if test="starttime != null ">and starttime = #{starttime}</if> <if test="endtime != null ">and endtime = #{endtime}</if>
