Merge branch 'master' of http://gogs.ywtinfo.com/ywt_rebuild_group/ywt-platform-outpatient-parent

ywt-platform-outpatient-batch/src/main/java/com/ywt/outpatient/batch/jobhandler/OutpatientJob.java

@@ -157,10 +157,14 @@ public class OutpatientJob {
         logger.info("In syncDoctorHisCodeInfoJobHandler - executing its JOB at " + new Date());
         try {
             List<DoctorHisCodePojo> doctorHisCodePojoList = new ArrayList<>();
-            List<DoctorHisCodePojo> byDoctorHisCodePojoList = syncDoctorHisCodeInfo(41, 541);
+            List<DoctorHisCodePojo> byShDoctorHisCodePojoList = syncDoctorHisCodeInfo(41, 540);
+            List<DoctorHisCodePojo> byHsDoctorHisCodePojoList = syncDoctorHisCodeInfo(41, 541);
             List<DoctorHisCodePojo> thDoctorHisCodePojoList = syncDoctorHisCodeInfo(12, 0);
-            if (!Checker.isNone(byDoctorHisCodePojoList)) {
-                doctorHisCodePojoList.addAll(byDoctorHisCodePojoList);
+            if (!Checker.isNone(byShDoctorHisCodePojoList)) {
+                doctorHisCodePojoList.addAll(byShDoctorHisCodePojoList);
+            }
+            if (!Checker.isNone(byHsDoctorHisCodePojoList)) {
+                doctorHisCodePojoList.addAll(byHsDoctorHisCodePojoList);
             }
             if (!Checker.isNone(thDoctorHisCodePojoList)) {
                 doctorHisCodePojoList.addAll(thDoctorHisCodePojoList);

ywt-platform-outpatient-batch/src/main/java/com/ywt/outpatient/batch/service/TaiheServiceSrv.java

@@ -43,6 +43,7 @@ public class TaiheServiceSrv {
             logger.error("TaiheServiceSrv>>getScheduleList({},{},{},{},{}, +++ {}, --- {}):获取排班信息:{}",
                     serviceDate, serviceEndDate, doctorCode, deptCode, hospitalId, res.getCode(), res.getMsg(), res.getSchedulesList().size());
             if (res.getCode() == ResultCode.SUCCEED_VALUE) {
+                logger.info("TaiheServiceSrv>>getScheduleList:{}",res.getSchedulesList());
                 return res.getSchedulesList();
             }
         } catch (Exception e) {