修改邵逸夫质控代码

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

@@ -20,10 +20,7 @@ import com.diagbot.facade.QcAbnormalFacade;
 import com.diagbot.facade.QcTypeFacade;
 import com.diagbot.service.impl.BehospitalInfoServiceImpl;
 import com.diagbot.service.impl.PatientInfoServiceImpl;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.StringUtil;
-import com.diagbot.util.TZDBConn;
+import com.diagbot.util.*;
 import com.diagbot.vo.data.ABehospitalInfoVO;
 import com.diagbot.vo.data.ADeleteFlagVO;
 import com.google.common.collect.Lists;
@@ -68,17 +65,14 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
     public void executeBehospital() {
 
         try {
-
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
-
             /*PatientListRequest patientListRequest = new PatientListRequest();
-                 *//*patientListRequest.setDATESTART(sdf.format(startTime));
+             *//*patientListRequest.setDATESTART(sdf.format(startTime));
                 patientListRequest.setDATEEND(sdf.format(endTime));*//*
                 patientListRequest.setDATESTART("2020-04-01 00:00:00");
                 patientListRequest.setDATEEND("2020-04-08 00:00:00");
                 PatientListResponse patientListResponse = aPatientListFacade.savePatientList(patientListRequest);*/
 
-                List<PatientInfo> patientInfoList = patientInfoServiceImpl.list();
+            List<PatientInfo> patientInfoList = patientInfoServiceImpl.list();
 
 
             for (int i = 0; i < patientInfoList.size(); i++) {
@@ -108,9 +102,7 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
                     behospitalInfo.setHospitalId(Long.parseLong("2"));
                     behospitalInfo.setName(sYFBeHospitalInfo.getPNAME());
                     behospitalInfo.setSex(sYFBeHospitalInfo.getPSEX());
-                    if (sYFBeHospitalInfo.getPBIRTHDAY() != null && sYFBeHospitalInfo.getPBIRTHDAY().length() > 0) {
-                        behospitalInfo.setBirthday(sdf.parse(sYFBeHospitalInfo.getPBIRTHDAY()));
-                    }
+                    behospitalInfo.setBirthday(ShaoyfDateUtil.parseDateTime(sYFBeHospitalInfo.getPBIRTHDAY()));
                     behospitalInfo.setFileCode(patientInfoList.get(i).getMrn());
                     behospitalInfo.setWardCode(sYFBeHospitalInfo.getWARDCODE());
                     behospitalInfo.setWardName(sYFBeHospitalInfo.getWARDCAME());
@@ -118,12 +110,8 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
                     behospitalInfo.setBehDeptName(sYFBeHospitalInfo.getDEPTNAME());
                     behospitalInfo.setBedCode(sYFBeHospitalInfo.getBEDID());
                     behospitalInfo.setInsuranceName(sYFBeHospitalInfo.getINSURANCENAME());
-                    if (sYFBeHospitalInfo.getADMID() != null && sYFBeHospitalInfo.getADMID().length() > 0) {
-                        behospitalInfo.setBehospitalDate(sdf.parse(sYFBeHospitalInfo.getADMID()));
-                    }
-                    if (sYFBeHospitalInfo.getDISCD() != null && sYFBeHospitalInfo.getDISCD().length() > 0) {
-                        behospitalInfo.setLeaveHospitalDate(sdf.parse(sYFBeHospitalInfo.getDISCD()));
-                    }
+                    behospitalInfo.setBehospitalDate(ShaoyfDateUtil.parseDateTime(sYFBeHospitalInfo.getADMID()));
+                    behospitalInfo.setLeaveHospitalDate(ShaoyfDateUtil.parseDateTime(sYFBeHospitalInfo.getDISCD()));
                     behospitalInfo.setDiagnoseIcd(sYFBeHospitalInfo.getDIAGNOSEICD());
                     behospitalInfo.setDiagnose(sYFBeHospitalInfo.getDIAGNOSE());
                     behospitalInfo.setDoctorId(sYFBeHospitalInfo.getDOCTORID());

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

@@ -15,10 +15,7 @@ import com.diagbot.entity.shaoyifu.util.SYFNlRequest;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.DoctorAdviceServiceImpl;
 import com.diagbot.service.impl.PatientInfoServiceImpl;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.StringUtil;
-import com.diagbot.util.TZDBConn;
+import com.diagbot.util.*;
 import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.ADoctorAdviceVO;
 import com.google.common.collect.Lists;
@@ -58,7 +55,6 @@ public class ADoctorAdviceFacade extends DoctorAdviceServiceImpl {
 
         try {
 
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
             /*PatientListRequest patientListRequest = new PatientListRequest();
              *//*patientListRequest.setDATESTART(sdf.format(startTime));
                 patientListRequest.setDATEEND(sdf.format(endTime));*//*
@@ -107,24 +103,20 @@ public class ADoctorAdviceFacade extends DoctorAdviceServiceImpl {
                     doctorAdvice.setDoseUnit(sYFDoctorAdviceList.get(j).getSunit());
                     doctorAdvice.setMedModeType(sYFDoctorAdviceList.get(j).getAdmission_name());
                     doctorAdvice.setDaFrequency(sYFDoctorAdviceList.get(j).getFrequency());
-                    if (sYFDoctorAdviceList.get(j).getDatestart() != null && sYFDoctorAdviceList.get(j).getDatestart().length() > 0) {
-                        doctorAdvice.setDaStartDate(sdf.parse(sYFDoctorAdviceList.get(j).getDatestart()));
-                    }
+                    doctorAdvice.setDaStartDate(ShaoyfDateUtil.parseDateTime(sYFDoctorAdviceList.get(j).getDatestart()));
                     doctorAdvice.setDaItemName(sYFDoctorAdviceList.get(j).getDrname());
                     doctorAdvice.setDaStatus(sYFDoctorAdviceList.get(j).getDoflag());
-                    if (sYFDoctorAdviceList.get(j).getDatestop() != null && sYFDoctorAdviceList.get(j).getDatestop().length() > 0) {
-                        doctorAdvice.setDaStopDate(sdf.parse(sYFDoctorAdviceList.get(j).getDatestop()));
-                    }
+                    doctorAdvice.setDaStopDate(ShaoyfDateUtil.parseDateTime(sYFDoctorAdviceList.get(j).getDatestop()));
                     doctorAdvice.setDaGroupNo(sYFDoctorAdviceList.get(j).getSetno());
                     doctorAdvice.setDaPrescriptionType(sYFDoctorAdviceList.get(j).getOrderflag_name());
                     doctorAdvice.setDoctorNotice(sYFDoctorAdviceList.get(j).getRemark());
                     doctorAdvice.setDoctorId(sYFDoctorAdviceList.get(j).getDr());
                     doctorAdvice.setDoctorName(sYFDoctorAdviceList.get(j).getDr_name());
-                    if(sYFDoctorAdviceList.get(j).getDrugType().equals("0")){ // 0=普药 1=抗生素 2=激素
+                    if (sYFDoctorAdviceList.get(j).getDrugType().equals("0")) { // 0=普药 1=抗生素 2=激素
                         doctorAdvice.setMedicineType("普药");
-                    }else if (sYFDoctorAdviceList.get(j).getDrugType().equals("1")){
+                    } else if (sYFDoctorAdviceList.get(j).getDrugType().equals("1")) {
                         doctorAdvice.setMedicineType("抗生素");
-                    }else if (sYFDoctorAdviceList.get(j).getDrugType().equals("2")){
+                    } else if (sYFDoctorAdviceList.get(j).getDrugType().equals("2")) {
                         doctorAdvice.setMedicineType("激素");
                     }
                     doctorAdviceList.add(doctorAdvice);

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

@@ -55,7 +55,6 @@ public class AHomeDiagnoseInfoFacade extends HomeDiagnoseInfoServiceImpl {
     public void executeHomeDiagnose() {
 
         try {
-
             /*PatientListRequest patientListRequest = new PatientListRequest();
              *//*patientListRequest.setDATESTART(sdf.format(startTime));
                 patientListRequest.setDATEEND(sdf.format(endTime));*//*

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

@@ -16,10 +16,7 @@ import com.diagbot.entity.shaoyifu.util.SYFNlRequest;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.HomeOperationInfoServiceImpl;
 import com.diagbot.service.impl.PatientInfoServiceImpl;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.DateUtil;
-import com.diagbot.util.StringUtil;
-import com.diagbot.util.TZDBConn;
+import com.diagbot.util.*;
 import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.AHomeOperationVO;
 import com.google.common.collect.Lists;
@@ -55,9 +52,6 @@ public class AHomeOperationInfoFacade extends HomeOperationInfoServiceImpl {
     public void executeHomeOperation() {
 
         try {
-
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
-
             /*PatientListRequest patientListRequest = new PatientListRequest();
              *//*patientListRequest.setDATESTART(sdf.format(startTime));
                 patientListRequest.setDATEEND(sdf.format(endTime));*//*
@@ -86,9 +80,7 @@ public class AHomeOperationInfoFacade extends HomeOperationInfoServiceImpl {
                     homeOperationInfo.setHomePageId(patientInfoList.get(i).getRdn());
                     /*homeOperationInfo.setHomePageId(patientListResponse.getData().get(i).getRDN());*/
                     homeOperationInfo.setHospitalId(Long.parseLong("2"));
-                    if (homePageOperationResponse.getData().get(j).getPlandate() != null && homePageOperationResponse.getData().get(j).getPlandate().length() > 0) {
-                        homeOperationInfo.setOperationDate(sdf.parse(homePageOperationResponse.getData().get(j).getPlandate()));
-                    }
+                    homeOperationInfo.setOperationDate(ShaoyfDateUtil.parseDateTime(homePageOperationResponse.getData().get(j).getPlandate()));
                     homeOperationInfo.setOperationCode(homePageOperationResponse.getData().get(j).getOperpcode());
                     homeOperationInfo.setOperationName(homePageOperationResponse.getData().get(j).getOperp());
                     homeOperationInfo.setOperationDoctorId(homePageOperationResponse.getData().get(j).getDrp());

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

@@ -77,11 +77,6 @@ public class AHomePageFacade extends HomePageServiceImpl {
      */
     public void executeHomePage() {
         try {
-
-            SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
-            SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy/MM/dd HH");
-            SimpleDateFormat sdf3 = new SimpleDateFormat("yyyy-MM-dd HH");
-
             /*PatientListRequest patientListRequest = new PatientListRequest();
              *//*patientListRequest.setDATESTART(sdf.format(startTime));
                 patientListRequest.setDATEEND(sdf.format(endTime));*//*
@@ -140,9 +135,7 @@ public class AHomePageFacade extends HomePageServiceImpl {
                             homePage.setSex("");
                             break;
                     }
-                    if (homePageResponse.getData().getPbirthday() != null && homePageResponse.getData().getPbirthday().length() > 0) {
-                        homePage.setBirthday(sdf1.parse(homePageResponse.getData().getPbirthday()));
-                    }
+                    homePage.setBirthday(ShaoyfDateUtil.parseDateTime(homePageResponse.getData().getPbirthday()));
                     homePage.setAge(homePageResponse.getData().getAge());
                     homePage.setAgeUnit(homePageResponse.getData().getAgeunit());
                     homePage.setNationality(homePageResponse.getData().getCitizenship());
@@ -168,25 +161,13 @@ public class AHomePageFacade extends HomePageServiceImpl {
                     homePage.setContactAddress(homePageResponse.getData().getConcatperson_adress());
                     homePage.setContactPhone(homePageResponse.getData().getConcatperson_phone());
                     homePage.setBehospitalWay(homePageResponse.getData().getInhos_way());
-                    if (homePageResponse.getData().getAdmid() != null && homePageResponse.getData().getAdmid().length() > 0) {
-                        if (homePageResponse.getData().getAdmid().indexOf("-") != -1) {
-                            homePage.setBehospitalDate(sdf3.parse(homePageResponse.getData().getAdmid()));
-                        } else if (homePageResponse.getData().getAdmid().indexOf("/") != -1) {
-                            homePage.setBehospitalDate(sdf2.parse(homePageResponse.getData().getAdmid()));
-                        }
-                    }
+                    homePage.setBehospitalDate(ShaoyfDateUtil.parseDateTime(homePageResponse.getData().getAdmid()));
                     homePage.setBehospitalDept(homePageResponse.getData().getInhosdept());
                     homePage.setBehospitalWard(homePageResponse.getData().getInhosward());
                     homePage.setBehospitalBedCode(homePageResponse.getData().getBedid_in());
                     homePage.setChangeDept(homePageResponse.getData().getTransferdept());
-                    if (homePageResponse.getData().getDiscd() != null && homePageResponse.getData().getDiscd().length() > 0) {
-                        if (homePageResponse.getData().getDiscd().indexOf("-") != -1) {
-                            homePage.setLeaveHospitalDate(sdf3.parse(homePageResponse.getData().getDiscd()));
-                        } else if (homePageResponse.getData().getDiscd().indexOf("/") != -1) {
-                            homePage.setLeaveHospitalDate(sdf2.parse(homePageResponse.getData().getDiscd()));
-                        }
+                    homePage.setLeaveHospitalDate(ShaoyfDateUtil.parseDateTime(homePageResponse.getData().getDiscd()));
 
-                    }
                     homePage.setLeaveHospitalDept(homePageResponse.getData().getOuthosdept());
                     homePage.setLeaveHospitalWard(homePageResponse.getData().getOuthosward());
                     homePage.setBehospitalDayNum(homePageResponse.getData().getInhosday());
@@ -210,9 +191,7 @@ public class AHomePageFacade extends HomePageServiceImpl {
                     homePage.setHomePageQuality(homePageResponse.getData().getMedical_quality());
                     homePage.setQcDoctor(homePageResponse.getData().getQc_doctor());
                     homePage.setQcNurse(homePageResponse.getData().getQc_nurse());
-                    if (homePageResponse.getData().getQc_date() != null && homePageResponse.getData().getQc_date().length() > 0) {
-                        homePage.setQcDate(sdf1.parse(homePageResponse.getData().getQc_date()));
-                    }
+                    homePage.setQcDate(ShaoyfDateUtil.parseDateTime(homePageResponse.getData().getQc_date()));
                     homePage.setLeaveHospitalType(homePageResponse.getData().getLeavehos_type());
                     homePage.setAcceptOrgCode(homePageResponse.getData().getAcceptOrgCode());
                     homePage.setAgainBehospitalPlan(homePageResponse.getData().getAgaininhosplan());

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

@@ -17,6 +17,7 @@ import com.diagbot.service.impl.MedCrisisInfoServiceImpl;
 import com.diagbot.service.impl.PatientInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
+import com.diagbot.util.ShaoyfDateUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.AMedCrisisVO;
@@ -45,8 +46,6 @@ public class AMedCrisisFacade extends MedCrisisInfoServiceImpl {
 
     public void executeMedCrisis() {
         try {
-
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
             /*PatientListRequest patientListRequest = new PatientListRequest();
              *//*patientListRequest.setDATESTART(sdf.format(startTime));
                 patientListRequest.setDATEEND(sdf.format(endTime));*//*
@@ -87,12 +86,8 @@ public class AMedCrisisFacade extends MedCrisisInfoServiceImpl {
                     medCrisisInfo.setCrisisValue(sYFMedCrisisList.get(j).getNotes());
                     medCrisisInfo.setCrisisTopValue(sYFMedCrisisList.get(j).getRefhigh());
                     medCrisisInfo.setCrisisLowerValue(sYFMedCrisisList.get(j).getReflow());
-                    if (sYFMedCrisisList.get(j).getDodate() != null && sYFMedCrisisList.get(j).getDodate().length() > 0) {
-                        medCrisisInfo.setSendDate(sdf.parse(sYFMedCrisisList.get(j).getDodate()));
-                    }
-                    if (sYFMedCrisisList.get(j).getReporttime() != null && sYFMedCrisisList.get(j).getReporttime().length() > 0) {
-                        medCrisisInfo.setRepDate(sdf.parse(sYFMedCrisisList.get(j).getReporttime()));
-                    }
+                    medCrisisInfo.setSendDate(ShaoyfDateUtil.parseDateTime(sYFMedCrisisList.get(j).getDodate()));
+                    medCrisisInfo.setRepDate(ShaoyfDateUtil.parseDateTime(sYFMedCrisisList.get(j).getReporttime()));
                     medCrisisInfoList.add(medCrisisInfo);
                 }
                 execute(medCrisisInfoList);

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

@@ -122,7 +122,6 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
 
                 List<MedicalRecord> medicalRecordList = Lists.newLinkedList();
                 List<MedicalRecordContent> medicalRecordContentList = Lists.newLinkedList();
-                SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
                 for (int j = 0; j < syfMedicalRecordList.size(); j++) {
 
                     MedicalRecord medicalRecord = new MedicalRecord();
@@ -131,9 +130,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
                     medicalRecord.setRecTypeId(syfMedicalRecordList.get(j).getMODELID());
                     medicalRecord.setRecId(syfMedicalRecordList.get(j).getWDLSH());
                     medicalRecord.setRecTitle(syfMedicalRecordList.get(j).getWSMC());
-                    if (syfMedicalRecordList.get(j).getLRRQ() != null && syfMedicalRecordList.get(j).getLRRQ().length() > 0) {
-                        medicalRecord.setRecDate(sdf1.parse(syfMedicalRecordList.get(j).getLRRQ()));
-                    }
+                    medicalRecord.setRecDate(ShaoyfDateUtil.parseDateTime(syfMedicalRecordList.get(j).getLRRQ()));
                     medicalRecordList.add(medicalRecord);
 
                     MedicalRecordContent medicalRecordContent = new MedicalRecordContent();
@@ -144,7 +141,7 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
                     medicalRecordContentList.add(medicalRecordContent);
 
                     try {
-                        if(medicalRecord.getRecTitle().equals("住院病案首页（病人存档及卫生统计用）")){
+                        if (medicalRecord.getRecTitle().equals("住院病案首页（病人存档及卫生统计用）")) {
                             //解析html获取病案首页、首页诊断、首页手术插入数据库
                             selectDataAndSave(medicalRecordContent, medicalRecord);
                         }

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

@@ -9,6 +9,7 @@ import com.diagbot.entity.shaoyifu.response.PatientListResponse;
 import com.diagbot.entity.shaoyifu.util.HttpApi;
 import com.diagbot.entity.shaoyifu.util.SYFNlRequest;
 import com.diagbot.service.impl.PatientInfoServiceImpl;
+import com.diagbot.util.ShaoyfDateUtil;
 import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -30,7 +31,6 @@ public class APatientListFacade extends PatientInfoServiceImpl {
      */
     public PatientListResponse savePatientList(PatientListRequest patientListRequest) {
 
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
         patientListRequest.setDATESTART("2020-06-17 00:00:00");
         patientListRequest.setDATEEND("2020-06-23 00:00:00");
 
@@ -52,19 +52,11 @@ public class APatientListFacade extends PatientInfoServiceImpl {
                     patientInfo.setMrn(sYFPatientList.get(i).getMRN());
                     patientInfo.setSeries(sYFPatientList.get(i).getSERIES());
                     patientInfo.setName(sYFPatientList.get(i).getPNAME());
-                    if (sYFPatientList.get(i).getADMID() != null && sYFPatientList.get(i).getADMID().length() > 0) {
-                        patientInfo.setBehospitalDate(sdf.parse(sYFPatientList.get(i).getADMID()));
-                    }
-                    if (sYFPatientList.get(i).getDISCD() != null && sYFPatientList.get(i).getDISCD().length() > 0) {
-                        patientInfo.setLeaveHospitalDate(sdf.parse(sYFPatientList.get(i).getDISCD()));
-                    }
+                    patientInfo.setBehospitalDate(ShaoyfDateUtil.parseDateTime(sYFPatientList.get(i).getADMID()));
+                    patientInfo.setLeaveHospitalDate(ShaoyfDateUtil.parseDateTime(sYFPatientList.get(i).getDISCD()));
                     patientInfo.setDeptId(sYFPatientList.get(i).getDEPTID());
-                    if (sYFPatientList.get(i).getINDATE() != null && sYFPatientList.get(i).getINDATE().length() > 0) {
-                        patientInfo.setInDate(sdf.parse(sYFPatientList.get(i).getINDATE()));
-                    }
-                    if (sYFPatientList.get(i).getCHECKDATE() != null && sYFPatientList.get(i).getCHECKDATE().length() > 0) {
-                        patientInfo.setCheckDate(sdf.parse(sYFPatientList.get(i).getCHECKDATE()));
-                    }
+                    patientInfo.setInDate(ShaoyfDateUtil.parseDateTime(sYFPatientList.get(i).getINDATE()));
+                    patientInfo.setCheckDate(ShaoyfDateUtil.parseDateTime(sYFPatientList.get(i).getCHECKDATE()));
 
                     patientList.add(patientInfo);
                 }