1

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

@@ -86,7 +86,7 @@ public class AMedLisResultFacade extends MedLisResultServiceImpl {
                 medLisResultList.stream().forEach(s -> {
                     MedLisResult medLisResult = this.getOne(new QueryWrapper<MedLisResult>()
                             .eq("item_code", s.getItemCode())
-                            .eq("rept_no", s.getReptNo())
+                            .eq("rept_no", s.getRepNo())
                             .eq("hospital_id", s.getHospitalId()), false);
                     if (medLisResult != null) {
                         s.setGmtModified(new Date());

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

@@ -111,7 +111,7 @@ public class AMedPacsInfoFacade extends MedPacsInfoServiceImpl {
                                         List<MedPacsResult> medPacsResultList = Lists.newLinkedList();
                                         for (int k = 0; k < sYFPacsResultList.size(); k++) {
                                             MedPacsResult medPacsResult = new MedPacsResult();
-                                            medPacsResult.setReptNo(sYFPacsResultList.get(k).getRepo());
+                                            medPacsResult.setRepNo(sYFPacsResultList.get(k).getRepo());
                                             medPacsResult.setHospitalId(Long.parseLong("2"));
                                             medPacsResult.setBehospitalCode(patientInfoList.get(i).getMrn());
                                             medPacsResult.setReptName(sYFPacsResultList.get(k).getReportname());

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

@@ -84,7 +84,7 @@ public class AMedPacsResultFacade extends MedPacsResultServiceImpl {
             if (medPacsResultList != null && medPacsResultList.size() > 0) {
                 medPacsResultList.stream().forEach(s -> {
                     MedPacsResult medPacsResult = this.getOne(new QueryWrapper<MedPacsResult>()
-                            .eq("rept_no", s.getReptNo())
+                            .eq("rept_no", s.getRepNo())
                             .eq("hospital_id", s.getHospitalId()), false);
                     if (medPacsResult != null) {
                         s.setGmtModified(new Date());

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

@@ -44,10 +44,10 @@ public class AMedRecordTypeFacade extends MedRecordTypeServiceImpl {
             request.setData(mRTypeRequest);
 
             HttpApi<MRTypeResponse> api = new HttpApi<>();
-            System.out.println(JSONObject.toJSONString(request));
+            //System.out.println(JSONObject.toJSONString(request));
 
             String a = api.doPost("http://192.1.2.31:9000/api/NlService/getEmrMbList", request);
-            System.out.println(a);
+            //System.out.println(a);
             MRTypeResponse response = JSON.parseObject(a, MRTypeResponse.class);
             if ("1".equals(response.getResult()) && response.getData() != null) {
                 List<SYFMedicalRecordType> sYFMedicalRecordTypeList = response.getData();

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

@@ -140,14 +140,14 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
                     medicalRecordContent.setXmlText(syfMedicalRecordList.get(j).getXMLWD());
                     medicalRecordContentList.add(medicalRecordContent);
 
-                    try {
+                    /*try {
                         if ("住院病案首页（病人存档及卫生统计用）".equals(medicalRecord.getRecTitle())) {
                             //解析html获取病案首页、首页诊断、首页手术插入数据库
                             selectDataAndSave(medicalRecordContent, medicalRecord);
                         }
                     } catch (Exception e) {
                         log.error(e.getMessage());
-                    }
+                    }*/
                 }
 
                 execute(medicalRecordList);

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

@@ -31,8 +31,8 @@ public class APatientListFacade extends PatientInfoServiceImpl {
      */
     public PatientListResponse savePatientList(PatientListRequest patientListRequest) {
 
-        patientListRequest.setDATESTART("2020-06-17 00:00:00");
-        patientListRequest.setDATEEND("2020-06-23 00:00:00");
+        patientListRequest.setDATESTART("2021-09-08 00:00:00");
+        patientListRequest.setDATEEND("2021-09-15 00:00:00");
 
         SYFNlRequest<PatientListRequest> request = new SYFNlRequest<>();
         request.setData(patientListRequest);

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

@@ -102,7 +102,9 @@ public class ShaoyfDateUtil {
             "yyyy-MM-ddHH:mm:ss.000",
             "yyyyMMddHH:mm",
             "yyyy-MM-dd'T'HH:mm:ss",
-            "yyyy"
+            "yyyy",
+            "yyyy-MM-ddHH",
+            "yyyy/MM/ddHH"
     };
 
 

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

@@ -695,7 +695,7 @@ public class TZDBConn {
 			ResultSet rs =dbconn.Query(sql, null);
 			while(rs.next()){
 				MedLisResult medLisResult=new MedLisResult();
-				medLisResult.setReptNo(rs.getString(""));
+				medLisResult.setRepNo(rs.getString(""));
 				medLisResult.setHospitalId(HOSPITAL_ID);
 				medLisResult.setBehospitalCode("");
 				medLisResult.setItemCode("");
@@ -730,7 +730,7 @@ public class TZDBConn {
 			ResultSet rs =dbconn.Query(sql, null);
 			while(rs.next()){
 				MedPacsResult medPacsResult=new MedPacsResult();
-				medPacsResult.setReptNo(rs.getString(""));
+				medPacsResult.setRepNo(rs.getString(""));
 				medPacsResult.setHospitalId(HOSPITAL_ID);
 				medPacsResult.setBehospitalCode("");
 				medPacsResult.setReptName("");

src/main/java/com/diagbot/web/PatientinfoController.java

@@ -3,7 +3,7 @@ package com.diagbot.web;
 
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.entity.shaoyifu.request.PatientListRequest;
-import com.diagbot.facade.data.APatientListFacade;
+import com.diagbot.facade.data.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,12 +28,30 @@ public class PatientinfoController {
 
     @Autowired
     APatientListFacade aPatientListFacade;
+    @Autowired
+    ABehospitalInfoFacade aBehospitalInfoFacade;
+    @Autowired
+    AHomePageFacade aHomePageFacade;
+    @Autowired
+    AMedicalRecordFacade aMedicalRecordFacade;
+    @Autowired
+    ADoctorAdviceFacade aDoctorAdviceFacade;
+    @Autowired
+    AMedRecordTypeFacade aMedRecordTypeFacade;
+
 
     @ApiOperation(value = "获取并保存一段时间内归档的患者信息",
             notes = "inputStr: 时间")
     @PostMapping("/savePatientList")
     @SysLogger("savePatientList")
     public void getPatientList(@RequestBody  PatientListRequest patientListRequest) {
-        aPatientListFacade.savePatientList(patientListRequest);
+        //aPatientListFacade.savePatientList(patientListRequest);
+        //aBehospitalInfoFacade.executeBehospital();
+        //aHomePageFacade.executeHomePage();
+        //aMedicalRecordFacade.executeMrRecord();
+        //aDoctorAdviceFacade.executeDoctorAdvice();
+        aMedRecordTypeFacade.executeMRType();
     }
+
+
 }

src/main/resources/application-local.yml

@@ -59,7 +59,7 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://127.0.0.1:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+      url: jdbc:mysql://127.0.0.1:3306/qc-shaoyifu?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
       username: root
       password: langtong
       # 连接池的配置信息