七院初始代码

src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

@@ -38,6 +38,7 @@ import com.diagbot.vo.TaskVO;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
+import mapper.QcModelHospitalFacade;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -1866,7 +1867,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                     List<ExportExcelWideBehospitalDTO> exportExcelWideBehospitalDTOs = new ArrayList<>();
                         excelBehospitalDTOS.forEach(exportExcelBehospitalDTO->{
                         ExportExcelWideBehospitalDTO exportExcelWideBehospitalDTO = new ExportExcelWideBehospitalDTO();
-                            exportExcelWideBehospitalDTO.setBehDoctorName(exportExcelBehospitalDTO.getBehDoctorName());
+                            exportExcelWideBehospitalDTO.setDoctorName(exportExcelBehospitalDTO.getDoctorName());
                             exportExcelWideBehospitalDTO.setBehospitalCode(exportExcelBehospitalDTO.getBehospitalCode());
                             exportExcelWideBehospitalDTO.setBehospitalDate(exportExcelBehospitalDTO.getBehospitalDate());
                             exportExcelWideBehospitalDTO.setLeaveHospitalDate(exportExcelBehospitalDTO.getLeaveHospitalDate());

src/main/java/com/diagbot/facade/data/AMedicalRecordFacade.java

@@ -283,8 +283,11 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
             executeMrRecord(aMrContentVO.getRecords());
 
             aMrContentVO.getRecords().stream().forEach(s -> {
-                //更新文书详情
-                aMedicalRecordContentFacade.executeMrRecordContent(s.getContents());
+                String sql ="select * from v_jkcdss_bl_bingli  where RECID= "+s.getRecId()+" ";
+                List<MedicalRecordContent> medicalRecordContent =tzDBConn.getMedicalRecordContent(sql);
+                    //更新文书详情
+                    aMedicalRecordContentFacade.execute(medicalRecordContent);
+
             });
 
             //数据解析,评分规则等还未完整时不解析
@@ -367,7 +370,10 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
             if (medicalRecordList != null && medicalRecordList.size() > 0) {
                 medicalRecordList.stream().forEach(s -> {
                     //初始化mode_id
+
                     Long modeId = initModeId(s);
+
+
                     if (modeId == Long.valueOf("0")) {
                         //新增类型到监测表中
                         QcAbnormal qcAbnormal = new QcAbnormal();

src/main/java/com/diagbot/util/TZDBConn.java

@@ -642,9 +642,9 @@ public class TZDBConn {
 			while(rs.next()){
 				MedicalRecordContent mrContent=new MedicalRecordContent();
 				mrContent.setHospitalId(HOSPITAL_ID);
-				mrContent.setRecId(rs.getString("BLJLID"));
-				//mrContent.setHtmlText(rs.getString("HTMLSJ"));
-				mrContent.setXmlText(rs.getString("BLJLNR"));
+				mrContent.setRecId(rs.getString("RECID"));
+				mrContent.setHospitalId(rs.getLong(8));
+				mrContent.setXmlText(rs.getString("XMLTEXT"));
 
 				mrContentList.add(mrContent);
 			}

src/main/resources/application-local.yml

@@ -59,9 +59,9 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+      url: jdbc:mysql://192.16.1.104:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
       username: root
-      password: lantone
+      password: lt@great
       # 连接池的配置信息
       # 初始化大小，最小，最大
       initialSize: 5
@@ -111,8 +111,8 @@ spring:
     database:
       cache: 8 # cache索引
       token: 8 # Token索引
-    host: 192.168.2.236  #Redis服务器地址
-    port: 6378 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
+    host: 192.16.1.104  #Redis服务器地址
+    port: 6379 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password: lantone # Redis服务器连接密码（默认为空）
     lettuce:
       pool:

src/main/resources/jdbc.properties

@@ -4,15 +4,15 @@
 #jdbc.username=root
 #jdbc.password=root
 
-#jdbc.driverClassName=oracle.jdbc.OracleDriver
-#jdbc.url=jdbc:oracle:thin:@192.168.2.246:1521/ORCL
-#jdbc.username=ETRACKMRQC
-#jdbc.password=ETRACKMRQC
+jdbc.driverClassName=oracle.jdbc.OracleDriver
+jdbc.url=jdbc:oracle:thin:@192.16.1.176:1521/ORCL
+jdbc.username=jkcdss
+jdbc.password=jkcdss
 
-jdbc.driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver
-jdbc.url=jdbc:sqlserver://192.168.100.39\\tzmhemr;DatabaseName=bigemr
-jdbc.username=zjlt
-jdbc.password=zjlt@2020
+#jdbc.driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver
+#jdbc.url=jdbc:sqlserver://192.168.100.39\\tzmhemr;DatabaseName=bigemr
+#jdbc.username=zjlt
+#jdbc.password=zjlt@2020
 
 #\u6570\u636e\u670d\u52a1\u6a21\u5f0f
 remote.address.ver=http://192.18.101.207:2030/index.html