修改质控代码

src/main/java/com/diagbot/entity/MedicalRecord.java

@@ -10,7 +10,7 @@ import java.util.Date;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author zhoutg
@@ -22,7 +22,7 @@ public class MedicalRecord implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @TableId(value = "rec_id",type = IdType.INPUT)
+    @TableId(value = "rec_id", type = IdType.INPUT)
     private String recId;
 
     /**

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ABehospitalInfoDTO;
 import com.diagbot.entity.*;
+import com.diagbot.entity.shaoyifu.entity.PatientInfo;
 import com.diagbot.entity.shaoyifu.entity.SYFBeHospitalInfo;
 import com.diagbot.entity.shaoyifu.request.BeHospitalInfoRequest;
 import com.diagbot.entity.shaoyifu.request.PatientListRequest;
@@ -16,6 +17,7 @@ import com.diagbot.enums.IsDeleteEnum;
 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;
@@ -49,6 +51,9 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
     @Autowired
     private APatientListFacade aPatientListFacade;
 
+    @Autowired
+    private PatientInfoServiceImpl patientInfoServiceImpl;
+
     private TZDBConn tzDBConn = new TZDBConn();
 
     /**
@@ -58,32 +63,22 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
 
         try {
 
-            /*SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            Calendar start = Calendar.getInstance();
-            start.setTime(new Date());
-            start.set(Calendar.DATE, start.get(Calendar.DATE) - 1);
-            start.set(Calendar.HOUR_OF_DAY, 0);
-            start.set(Calendar.MINUTE, 0);
-            start.set(Calendar.SECOND, 0);
-            Date startTime = start.getTime();
-            Calendar end = Calendar.getInstance();
-            end.setTime(new Date());
-            end.set(Calendar.DATE, end.get(Calendar.DATE));
-            end.set(Calendar.HOUR_OF_DAY, 0);
-            end.set(Calendar.MINUTE, 0);
-            end.set(Calendar.SECOND, 0);
-            Date endTime = end.getTime();*/
-            PatientListRequest patientListRequest = new PatientListRequest();
-            /*patientListRequest.setDATESTART(sdf.format(startTime));
-            patientListRequest.setDATEEND(sdf.format(endTime));*/
+            /*PatientListRequest patientListRequest = new PatientListRequest();
+            *//*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.getPatientList(patientListRequest);
+            PatientListResponse patientListResponse = aPatientListFacade.savePatientList(patientListRequest);*/
 
-            for (int i = 0; i < patientListResponse.getData().size(); i++) {
+            List<PatientInfo> patientInfoList = patientInfoServiceImpl.list();
+
+            for (int i = 0; i < patientInfoList.size(); i++) {
                 BeHospitalInfoRequest beHospitalInfoRequest = new BeHospitalInfoRequest();
-                beHospitalInfoRequest.setMRN(patientListResponse.getData().get(i).getMRN());
-                beHospitalInfoRequest.setSERIES(patientListResponse.getData().get(i).getSERIES());
+                beHospitalInfoRequest.setMRN(patientInfoList.get(i).getMrn());
+                beHospitalInfoRequest.setSERIES(patientInfoList.get(i).getSeries());
+
+                /*beHospitalInfoRequest.setMRN(patientListResponse.getData().get(i).getMRN());
+                beHospitalInfoRequest.setSERIES(patientListResponse.getData().get(i).getSERIES());*/
 
                 HttpApi<BeHospitalInfoResponse> httpApi = new HttpApi<>();
                 SYFInterfaceRequest<BeHospitalInfoRequest> request = new SYFInterfaceRequest<>();
@@ -99,7 +94,8 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
                 if (sYFBeHospitalInfo != null) {
                     BehospitalInfo behospitalInfo = new BehospitalInfo();
-                    behospitalInfo.setBehospitalCode(patientListResponse.getData().get(i).getMRN() + "_" + patientListResponse.getData().get(i).getSERIES());
+                    behospitalInfo.setBehospitalCode(patientInfoList.get(i).getMrn() + "_" + patientInfoList.get(i).getSeries());
+                    //behospitalInfo.setBehospitalCode(patientListResponse.getData().get(i).getMRN() + "_" + patientListResponse.getData().get(i).getSERIES());
                     behospitalInfo.setHospitalId(Long.parseLong("2"));
                     behospitalInfo.setName(sYFBeHospitalInfo.getPNAME());
                     behospitalInfo.setSex(sYFBeHospitalInfo.getPSEX());

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

@@ -5,14 +5,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ADoctorAdviceDTO;
 import com.diagbot.entity.DoctorAdvice;
+import com.diagbot.entity.shaoyifu.entity.PatientInfo;
 import com.diagbot.entity.shaoyifu.entity.SYFDoctorAdvice;
 import com.diagbot.entity.shaoyifu.request.DoctorAdviceRequest;
-import com.diagbot.entity.shaoyifu.request.PatientListRequest;
 import com.diagbot.entity.shaoyifu.response.DoctorAdviceResponse;
-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.DoctorAdviceServiceImpl;
+import com.diagbot.service.impl.PatientInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.StringUtil;
@@ -28,7 +28,7 @@ import java.util.Date;
 import java.util.List;
 
 @Component
-public class ADoctorAdviceFacade extends DoctorAdviceServiceImpl{
+public class ADoctorAdviceFacade extends DoctorAdviceServiceImpl {
 
     @Autowired
     @Qualifier("doctorAdviceServiceImpl")
@@ -37,6 +37,12 @@ public class ADoctorAdviceFacade extends DoctorAdviceServiceImpl{
     @Autowired
     private APatientListFacade aPatientListFacade;
 
+    @Autowired
+    private PatientInfoServiceImpl patientInfoServiceImpl;
+
+    @Autowired
+    private DateFacade dateFacade;
+
     private TZDBConn tzDBConn = new TZDBConn();
 
     /**
@@ -45,34 +51,24 @@ public class ADoctorAdviceFacade extends DoctorAdviceServiceImpl{
     public void executeDoctorAdvice() {
 
         try {
-            /*SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            Calendar start = Calendar.getInstance();
-            start.setTime(new Date());
-            start.set(Calendar.DATE, start.get(Calendar.DATE) - 1);
-            start.set(Calendar.HOUR_OF_DAY, 0);
-            start.set(Calendar.MINUTE, 0);
-            start.set(Calendar.SECOND, 0);
-            Date startTime = start.getTime();
-            Calendar end = Calendar.getInstance();
-            end.setTime(new Date());
-            end.set(Calendar.DATE, end.get(Calendar.DATE));
-            end.set(Calendar.HOUR_OF_DAY, 0);
-            end.set(Calendar.MINUTE, 0);
-            end.set(Calendar.SECOND, 0);
-            Date endTime = end.getTime();*/
-            PatientListRequest patientListRequest = new PatientListRequest();
-            /*patientListRequest.setDATESTART(sdf.format(startTime));
-            patientListRequest.setDATEEND(sdf.format(endTime));*/
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+            /*PatientListRequest patientListRequest = new PatientListRequest();
+             *//*patientListRequest.setDATESTART(sdf.format(dateFacade.getStartDate()));
+            patientListRequest.setDATEEND(sdf.format(dateFacade.getEndDate()));*//*
             patientListRequest.setDATESTART("2020-04-01 00:00:00");
             patientListRequest.setDATEEND("2020-04-08 00:00:00");
-            PatientListResponse patientListResponse = aPatientListFacade.getPatientList(patientListRequest);
+            PatientListResponse patientListResponse = aPatientListFacade.getPatientList(patientListRequest);*/
 
-            for (int i = 0; i < patientListResponse.getData().size(); i++) {
+            List<PatientInfo> patientInfoList = patientInfoServiceImpl.list();
+
+            for (int i = 0; i < patientInfoList.size(); i++) {
 
                 SYFNlRequest<DoctorAdviceRequest> request = new SYFNlRequest<>();
                 DoctorAdviceRequest doctorAdviceRequest = new DoctorAdviceRequest();
-                doctorAdviceRequest.setMrn(patientListResponse.getData().get(i).getMRN());
-                doctorAdviceRequest.setSeries(patientListResponse.getData().get(i).getSERIES());
+                doctorAdviceRequest.setMrn(patientInfoList.get(i).getMrn());
+                doctorAdviceRequest.setSeries(patientInfoList.get(i).getSeries());
+                /*doctorAdviceRequest.setMrn(patientListResponse.getData().get(i).getMRN());
+                doctorAdviceRequest.setSeries(patientListResponse.getData().get(i).getSERIES());*/
                 request.setData(doctorAdviceRequest);
 
                 HttpApi<DoctorAdviceResponse> httpApi = new HttpApi<>();
@@ -82,12 +78,13 @@ public class ADoctorAdviceFacade extends DoctorAdviceServiceImpl{
 
                 List<SYFDoctorAdvice> sYFDoctorAdviceList = doctorAdviceResponse.getData();
                 List<DoctorAdvice> doctorAdviceList = Lists.newLinkedList();
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+
                 for (int j = 0; j < sYFDoctorAdviceList.size(); j++) {
                     DoctorAdvice doctorAdvice = new DoctorAdvice();
                     doctorAdvice.setDoctorAdviceId(sYFDoctorAdviceList.get(j).getOrderno());
                     doctorAdvice.setHospitalId(Long.parseLong("2"));
-                    doctorAdvice.setBehospitalCode(patientListResponse.getData().get(i).getMRN() + "_" + patientListResponse.getData().get(i).getSERIES());
+                    doctorAdvice.setBehospitalCode(patientInfoList.get(i).getMrn() + "_" + patientInfoList.get(i).getSeries());
+                    //doctorAdvice.setBehospitalCode(patientListResponse.getData().get(i).getMRN() + "_" + patientListResponse.getData().get(i).getSERIES());
                     doctorAdvice.setOrderDoctorName(sYFDoctorAdviceList.get(j).getDr_name());
                     doctorAdvice.setFrequency(sYFDoctorAdviceList.get(j).getFrequency_name());
                     doctorAdvice.setDoctorAdviceType(sYFDoctorAdviceList.get(j).getOrdertype());
@@ -122,50 +119,52 @@ public class ADoctorAdviceFacade extends DoctorAdviceServiceImpl{
     }
 
     public void executeDoctorAdvicePast() {
-        String sql="select * from br_doctadvice where cjcxrq>=dateadd(day,-2,getdate()) and cjcxrq<=getdate()";
+        String sql = "select * from br_doctadvice where cjcxrq>=dateadd(day,-2,getdate()) and cjcxrq<=getdate()";
         List<DoctorAdvice> doctorAdviceList = tzDBConn.getDoctorAdvice(sql);
         execute(doctorAdviceList);
     }
+
     /**
      * 数据引擎-通过接口更新医生医嘱信息
+     *
      * @param list
      * @return
      */
     public RespDTO<List<ADoctorAdviceDTO>> executeDoctorAdvice(List<ADoctorAdviceVO> list) {
-        if(list!=null && list.size()>0){
+        if (list != null && list.size() > 0) {
             //循环验证数据有效性
-            for (ADoctorAdviceVO doctorAdvice:list) {
-                if("".equals(doctorAdvice.getDoctorAdviceId())) {
+            for (ADoctorAdviceVO doctorAdvice : list) {
+                if ("".equals(doctorAdvice.getDoctorAdviceId())) {
                     return RespDTO.onError("请输入病人医嘱编码!");
-                }else if(doctorAdvice.getHospitalId()==null){
+                } else if (doctorAdvice.getHospitalId() == null) {
                     return RespDTO.onError("请输入医院编码!");
-                }else if("".equals(doctorAdvice.getBehospitalCode())){
+                } else if ("".equals(doctorAdvice.getBehospitalCode())) {
                     return RespDTO.onError("请输入病人住院编码!");
                 }
             }
             //初始、格式化数据
-            List<DoctorAdvice> doctorAdviceList=Lists.newArrayList();
-            List<ADoctorAdviceDTO> doctorAdviceDtoList=Lists.newArrayList();
-            list.stream().forEach(s->{
-                DoctorAdvice doctorAdvice=new DoctorAdvice();
-                BeanUtil.copyProperties(s,doctorAdvice);
-                if(StringUtil.isNotBlank(s.getDaStartDate())){
+            List<DoctorAdvice> doctorAdviceList = Lists.newArrayList();
+            List<ADoctorAdviceDTO> doctorAdviceDtoList = Lists.newArrayList();
+            list.stream().forEach(s -> {
+                DoctorAdvice doctorAdvice = new DoctorAdvice();
+                BeanUtil.copyProperties(s, doctorAdvice);
+                if (StringUtil.isNotBlank(s.getDaStartDate())) {
                     doctorAdvice.setDaStartDate(DateUtil.parseDateTime(s.getDaStartDate()));
                 }
-                if(StringUtil.isNotBlank(s.getDaStopDate())){
+                if (StringUtil.isNotBlank(s.getDaStopDate())) {
                     doctorAdvice.setDaStopDate(DateUtil.parseDateTime(s.getDaStopDate()));
                 }
                 doctorAdviceList.add(doctorAdvice);
             });
             execute(doctorAdviceList);
-            doctorAdviceDtoList=BeanUtil.listCopyTo(list,ADoctorAdviceDTO.class);
+            doctorAdviceDtoList = BeanUtil.listCopyTo(list, ADoctorAdviceDTO.class);
             return RespDTO.onSuc(doctorAdviceDtoList);
-        }else{
+        } else {
             return RespDTO.onError("未接收到数据!");
         }
     }
 
-    public void execute(List<DoctorAdvice> doctorAdviceList){
+    public void execute(List<DoctorAdvice> doctorAdviceList) {
         List<DoctorAdvice> addE = Lists.newLinkedList();
         List<DoctorAdvice> updateE = Lists.newLinkedList();
         if (doctorAdviceList != null && doctorAdviceList.size() > 0) {
@@ -173,7 +172,7 @@ public class ADoctorAdviceFacade extends DoctorAdviceServiceImpl{
                 DoctorAdvice doctorAdvice = this.getOne(new QueryWrapper<DoctorAdvice>()
                         .eq("doctor_advice_id", s.getDoctorAdviceId())
                         .eq("hospital_id", s.getHospitalId())
-                        .eq("behospital_code",s.getBehospitalCode()), false);
+                        .eq("behospital_code", s.getBehospitalCode()), false);
                 if (doctorAdvice != null) {
                     s.setGmtModified(new Date());
                     updateE.add(s);
@@ -183,10 +182,10 @@ public class ADoctorAdviceFacade extends DoctorAdviceServiceImpl{
                 }
             });
         }
-        if(addE.size()>0){
+        if (addE.size() > 0) {
             doctorAdviceService.saveBatch(addE);
         }
-        if(updateE.size()>0){
+        if (updateE.size() > 0) {
             doctorAdviceService.updateBatchByKey(updateE);
         }
     }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.AHomeDiagnoseDTO;
 import com.diagbot.entity.HomeDiagnoseInfo;
+import com.diagbot.entity.shaoyifu.entity.PatientInfo;
 import com.diagbot.entity.shaoyifu.request.HomePageDiagnoseRequest;
 import com.diagbot.entity.shaoyifu.request.PatientListRequest;
 import com.diagbot.entity.shaoyifu.response.HomePageDiagnoseResponse;
@@ -12,6 +13,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.HomeDiagnoseInfoServiceImpl;
+import com.diagbot.service.impl.PatientInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.TZDBConn;
 import com.diagbot.vo.data.AHomeDiagnoseVO;
@@ -24,7 +26,7 @@ import java.util.Date;
 import java.util.List;
 
 @Component
-public class AHomeDiagnoseInfoFacade extends HomeDiagnoseInfoServiceImpl{
+public class AHomeDiagnoseInfoFacade extends HomeDiagnoseInfoServiceImpl {
 
     @Autowired
     @Qualifier("homeDiagnoseInfoServiceImpl")
@@ -33,6 +35,9 @@ public class AHomeDiagnoseInfoFacade extends HomeDiagnoseInfoServiceImpl{
     @Autowired
     private APatientListFacade aPatientListFacade;
 
+    @Autowired
+    private PatientInfoServiceImpl patientInfoServiceImpl;
+
     private TZDBConn tzDBConn = new TZDBConn();
 
     /**
@@ -41,34 +46,22 @@ public class AHomeDiagnoseInfoFacade extends HomeDiagnoseInfoServiceImpl{
     public void executeHomeDiagnose() {
 
         try {
-            /*SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            Calendar start = Calendar.getInstance();
-            start.setTime(new Date());
-            start.set(Calendar.DATE, start.get(Calendar.DATE) - 1);
-            start.set(Calendar.HOUR_OF_DAY, 0);
-            start.set(Calendar.MINUTE, 0);
-            start.set(Calendar.SECOND, 0);
-            Date startTime = start.getTime();
-            Calendar end = Calendar.getInstance();
-            end.setTime(new Date());
-            end.set(Calendar.DATE, end.get(Calendar.DATE));
-            end.set(Calendar.HOUR_OF_DAY, 0);
-            end.set(Calendar.MINUTE, 0);
-            end.set(Calendar.SECOND, 0);
-            Date endTime = end.getTime();*/
-
-            PatientListRequest patientListRequest = new PatientListRequest();
-            /*patientListRequest.setDATESTART(sdf.format(startTime));
-            patientListRequest.setDATEEND(sdf.format(endTime));*/
+
+            /*PatientListRequest patientListRequest = new PatientListRequest();
+             *//*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.getPatientList(patientListRequest);
+            PatientListResponse patientListResponse = aPatientListFacade.getPatientList(patientListRequest);*/
+
+            List<PatientInfo> patientInfoList = patientInfoServiceImpl.list();
 
-            for (int i = 0; i < patientListResponse.getData().size(); i++) {
+            for (int i = 0; i < patientInfoList.size(); i++) {
 
                 SYFNlRequest<HomePageDiagnoseRequest> request = new SYFNlRequest<>();
                 HomePageDiagnoseRequest homePageDiagnoseRequest = new HomePageDiagnoseRequest();
-                homePageDiagnoseRequest.setRdn(patientListResponse.getData().get(i).getRDN());
+                homePageDiagnoseRequest.setRdn(patientInfoList.get(i).getRdn());
+                /*homePageDiagnoseRequest.setRdn(patientListResponse.getData().get(i).getRDN());*/
                 request.setData(homePageDiagnoseRequest);
 
                 HttpApi<HomePageDiagnoseResponse> httpApi = new HttpApi<>();
@@ -79,7 +72,8 @@ public class AHomeDiagnoseInfoFacade extends HomeDiagnoseInfoServiceImpl{
                 for (int j = 0; j < homePageDiagnoseResponse.getData().size(); j++) {
 
                     HomeDiagnoseInfo homeDiagnoseInfo = new HomeDiagnoseInfo();
-                    homeDiagnoseInfo.setHomePageId(patientListResponse.getData().get(i).getRDN());
+                    homeDiagnoseInfo.setHomePageId(patientInfoList.get(i).getRdn());
+                    /*homeDiagnoseInfo.setHomePageId(patientListResponse.getData().get(i).getRDN());*/
                     homeDiagnoseInfo.setHospitalId(Long.parseLong("2"));
                     homeDiagnoseInfo.setDiagnoseOrderNo(homePageDiagnoseResponse.getData().get(j).getRdn());
                     homeDiagnoseInfo.setDiagnoseType(homePageDiagnoseResponse.getData().get(j).getPrimaryflag());
@@ -103,29 +97,30 @@ public class AHomeDiagnoseInfoFacade extends HomeDiagnoseInfoServiceImpl{
 
     /**
      * 数据引擎-通过接口更新病案首页诊断
+     *
      * @param list
      * @return
      */
     public RespDTO<List<AHomeDiagnoseDTO>> executeHomeDiagnose(List<AHomeDiagnoseVO> list) {
-        if(list!=null && list.size()>0){
-            List<HomeDiagnoseInfo> homeDiagnoseList=Lists.newArrayList();
-            List<AHomeDiagnoseDTO> homeDiagnoseDtoList=Lists.newArrayList();
+        if (list != null && list.size() > 0) {
+            List<HomeDiagnoseInfo> homeDiagnoseList = Lists.newArrayList();
+            List<AHomeDiagnoseDTO> homeDiagnoseDtoList = Lists.newArrayList();
 
-            homeDiagnoseList=BeanUtil.listCopyTo(list,HomeDiagnoseInfo.class);
-            homeDiagnoseDtoList=BeanUtil.listCopyTo(list,AHomeDiagnoseDTO.class);
+            homeDiagnoseList = BeanUtil.listCopyTo(list, HomeDiagnoseInfo.class);
+            homeDiagnoseDtoList = BeanUtil.listCopyTo(list, AHomeDiagnoseDTO.class);
             execute(homeDiagnoseList);
             return RespDTO.onSuc(homeDiagnoseDtoList);
-        }else{
+        } else {
             return RespDTO.onError("未接收到数据!");
         }
     }
 
-    public void execute(List<HomeDiagnoseInfo> homeDiagnoseList){
+    public void execute(List<HomeDiagnoseInfo> homeDiagnoseList) {
         List<HomeDiagnoseInfo> addE = Lists.newLinkedList();
         List<HomeDiagnoseInfo> updateE = Lists.newLinkedList();
         if (homeDiagnoseList != null && homeDiagnoseList.size() > 0) {
             homeDiagnoseList.stream().forEach(s -> {
-                if(s.getHomePageId()!=null && !"".equals(s.getDiagnoseOrderNo())){
+                if (s.getHomePageId() != null && !"".equals(s.getDiagnoseOrderNo())) {
                     HomeDiagnoseInfo diagnoseInfo = this.getOne(new QueryWrapper<HomeDiagnoseInfo>()
                             .eq("home_page_id", s.getHomePageId())
                             .eq("hospital_id", s.getHospitalId())
@@ -140,10 +135,10 @@ public class AHomeDiagnoseInfoFacade extends HomeDiagnoseInfoServiceImpl{
                 }
             });
         }
-        if(addE.size()>0){
+        if (addE.size() > 0) {
             homeDiagnoseInfoService.saveBatch(addE);
         }
-        if(updateE.size()>0){
+        if (updateE.size() > 0) {
             homeDiagnoseInfoService.updateBatchByKey(updateE);
         }
     }

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.data.AHomeOperationDTO;
 import com.diagbot.entity.HomeOperationInfo;
+import com.diagbot.entity.shaoyifu.entity.PatientInfo;
 import com.diagbot.entity.shaoyifu.request.HomePageOperationRequest;
 import com.diagbot.entity.shaoyifu.request.PatientListRequest;
 import com.diagbot.entity.shaoyifu.response.HomePageOperationResponse;
@@ -11,6 +12,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.HomeOperationInfoServiceImpl;
+import com.diagbot.service.impl.PatientInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.TZDBConn;
@@ -34,6 +36,9 @@ public class AHomeOperationInfoFacade extends HomeOperationInfoServiceImpl{
     @Autowired
     private APatientListFacade aPatientListFacade;
 
+    @Autowired
+    private PatientInfoServiceImpl patientInfoServiceImpl;
+
     private TZDBConn tzDBConn = new TZDBConn();
 
     /**
@@ -42,35 +47,21 @@ public class AHomeOperationInfoFacade extends HomeOperationInfoServiceImpl{
     public void executeHomeOperation() {
 
         try {
-
-            /*SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            Calendar start = Calendar.getInstance();
-            start.setTime(new Date());
-            start.set(Calendar.DATE, start.get(Calendar.DATE) - 1);
-            start.set(Calendar.HOUR_OF_DAY, 0);
-            start.set(Calendar.MINUTE, 0);
-            start.set(Calendar.SECOND, 0);
-            Date startTime = start.getTime();
-            Calendar end = Calendar.getInstance();
-            end.setTime(new Date());
-            end.set(Calendar.DATE, end.get(Calendar.DATE));
-            end.set(Calendar.HOUR_OF_DAY, 0);
-            end.set(Calendar.MINUTE, 0);
-            end.set(Calendar.SECOND, 0);
-            Date endTime = end.getTime();*/
-
-            PatientListRequest patientListRequest = new PatientListRequest();
-            /*patientListRequest.setDATESTART(sdf.format(startTime));
-            patientListRequest.setDATEEND(sdf.format(endTime));*/
+            /*PatientListRequest patientListRequest = new PatientListRequest();
+            *//*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.getPatientList(patientListRequest);
+            PatientListResponse patientListResponse = aPatientListFacade.getPatientList(patientListRequest);*/
+
+            List<PatientInfo> patientInfoList = patientInfoServiceImpl.list();
 
-            for (int i = 0; i < patientListResponse.getData().size(); i++) {
+            for (int i = 0; i < patientInfoList.size(); i++) {
 
                 SYFNlRequest<HomePageOperationRequest> request = new SYFNlRequest<>();
                 HomePageOperationRequest homePageOperationRequest = new HomePageOperationRequest();
-                homePageOperationRequest.setRdn(patientListResponse.getData().get(i).getRDN());
+                homePageOperationRequest.setRdn(patientInfoList.get(i).getRdn());
+                /*homePageOperationRequest.setRdn(patientListResponse.getData().get(i).getRDN());*/
                 request.setData(homePageOperationRequest);
 
                 HttpApi<HomePageOperationResponse> httpApi = new HttpApi<>();
@@ -82,7 +73,8 @@ public class AHomeOperationInfoFacade extends HomeOperationInfoServiceImpl{
                 for (int j = 0; j < homePageOperationResponse.getData().size(); j++) {
 
                     HomeOperationInfo homeOperationInfo = new HomeOperationInfo();
-                    homeOperationInfo.setHomePageId(patientListResponse.getData().get(i).getRDN());
+                    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()));

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

@@ -6,6 +6,7 @@ import com.diagbot.dto.AnalyzeRunDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.AHomePageDTO;
 import com.diagbot.entity.HomePage;
+import com.diagbot.entity.shaoyifu.entity.PatientInfo;
 import com.diagbot.entity.shaoyifu.request.HomePageRequest;
 import com.diagbot.entity.shaoyifu.request.PatientListRequest;
 import com.diagbot.entity.shaoyifu.response.HomePageResponse;
@@ -14,6 +15,7 @@ import com.diagbot.entity.shaoyifu.util.HttpApi;
 import com.diagbot.entity.shaoyifu.util.SYFNlRequest;
 import com.diagbot.facade.BehospitalInfoFacade;
 import com.diagbot.service.impl.HomePageServiceImpl;
+import com.diagbot.service.impl.PatientInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.ReadProperties;
@@ -56,6 +58,9 @@ public class AHomePageFacade extends HomePageServiceImpl{
     @Autowired
     private APatientListFacade aPatientListFacade;
 
+    @Autowired
+    private PatientInfoServiceImpl patientInfoServiceImpl;
+
     private TZDBConn tzDBConn = new TZDBConn();
 
     /*public static void main(String[] args){
@@ -75,34 +80,22 @@ public class AHomePageFacade extends HomePageServiceImpl{
      */
     public void executeHomePage() {
         try {
-            /*SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            Calendar start = Calendar.getInstance();
-            start.setTime(new Date());
-            start.set(Calendar.DATE, start.get(Calendar.DATE) - 1);
-            start.set(Calendar.HOUR_OF_DAY, 0);
-            start.set(Calendar.MINUTE, 0);
-            start.set(Calendar.SECOND, 0);
-            Date startTime = start.getTime();
-            Calendar end = Calendar.getInstance();
-            end.setTime(new Date());
-            end.set(Calendar.DATE, end.get(Calendar.DATE));
-            end.set(Calendar.HOUR_OF_DAY, 0);
-            end.set(Calendar.MINUTE, 0);
-            end.set(Calendar.SECOND, 0);
-            Date endTime = end.getTime();*/
-
-            PatientListRequest patientListRequest = new PatientListRequest();
-            /*patientListRequest.setDATESTART(sdf.format(startTime));
-            patientListRequest.setDATEEND(sdf.format(endTime));*/
+            /*PatientListRequest patientListRequest = new PatientListRequest();
+            *//*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.getPatientList(patientListRequest);
+            PatientListResponse patientListResponse = aPatientListFacade.getPatientList(patientListRequest);*/
+
+            List<PatientInfo> patientInfoList = patientInfoServiceImpl.list();
 
-            for (int i = 0; i < patientListResponse.getData().size(); i++) {
+            for (int i = 0; i < patientInfoList.size(); i++) {
 
                 SYFNlRequest<HomePageRequest> request = new SYFNlRequest<>();
                 HomePageRequest homePageRequest = new HomePageRequest();
-                homePageRequest.setRdn(patientListResponse.getData().get(i).getRDN());
+                homePageRequest.setRdn(patientInfoList.get(i).getRdn());
+
+                /*homePageRequest.setRdn(patientListResponse.getData().get(i).getRDN());*/
                 request.setData(homePageRequest);
 
                 HttpApi<HomePageResponse> httpApi = new HttpApi<>();
@@ -117,7 +110,9 @@ public class AHomePageFacade extends HomePageServiceImpl{
                     HomePage homePage = new HomePage();
                     homePage.setHomePageId(homePageResponse.getData().getRdn());
                     homePage.setHospitalId(Long.parseLong("2"));
-                    homePage.setBehospitalCode(patientListResponse.getData().get(i).getMRN() + "_" + patientListResponse.getData().get(i).getSERIES());
+                    homePage.setBehospitalCode(patientInfoList.get(i).getMrn() + "_" + patientInfoList.get(i).getSeries());
+
+                    //homePage.setBehospitalCode(patientListResponse.getData().get(i).getMRN() + "_" + patientListResponse.getData().get(i).getSERIES());
                     homePage.setHospitalCode("A001");
                     homePage.setHospitalName("邵逸夫");
                     homePage.setOrgCode("A001");

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

@@ -1,19 +1,9 @@
 package com.diagbot.facade.data;
 
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.AMedicalRecordContentDTO;
-import com.diagbot.entity.MedicalRecord;
 import com.diagbot.entity.MedicalRecordContent;
-import com.diagbot.entity.QcModelHospital;
-import com.diagbot.entity.shaoyifu.entity.SYFMedicalRecord;
-import com.diagbot.entity.shaoyifu.request.MedicalRecordRequest;
-import com.diagbot.entity.shaoyifu.request.PatientListRequest;
-import com.diagbot.entity.shaoyifu.response.MedicalRecordResponse;
-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.MedicalRecordContentServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.TZDBConn;
@@ -23,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
-import java.text.SimpleDateFormat;
 import java.util.*;
 
 @Component
@@ -33,90 +22,16 @@ public class AMedicalRecordContentFacade extends MedicalRecordContentServiceImpl
     @Autowired
     private MedicalRecordContentServiceImpl medicalRecordContentService;
 
-    @Autowired
-    private AMedicalRecordFacade aMedicalRecordFacade;
-
-    @Autowired
-    private APatientListFacade aPatientListFacade;
-
     private TZDBConn tzDBConn = new TZDBConn();
 
     /**
      * 终末质控-同步前一天的病历详细记录
      */
     public void executeMrRecordContent() {
-
-        try {
-            /*SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            Calendar start = Calendar.getInstance();
-            start.setTime(new Date());
-            start.set(Calendar.DATE, start.get(Calendar.DATE) - 1);
-            start.set(Calendar.HOUR_OF_DAY, 0);
-            start.set(Calendar.MINUTE, 0);
-            start.set(Calendar.SECOND, 0);
-            Date startTime = start.getTime();
-            Calendar end = Calendar.getInstance();
-            end.setTime(new Date());
-            end.set(Calendar.DATE, end.get(Calendar.DATE));
-            end.set(Calendar.HOUR_OF_DAY, 0);
-            end.set(Calendar.MINUTE, 0);
-            end.set(Calendar.SECOND, 0);
-            Date endTime = end.getTime();*/
-
-            PatientListRequest patientListRequest = new PatientListRequest();
-            /*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.getPatientList(patientListRequest);
-
-            for (int i = 0; i < patientListResponse.getData().size(); i++) {
-                MedicalRecordRequest medicalRecordRequest = new MedicalRecordRequest();
-                medicalRecordRequest.setMRN(patientListResponse.getData().get(i).getMRN());
-                medicalRecordRequest.setSERIES(patientListResponse.getData().get(i).getSERIES());
-
-                HttpApi<MedicalRecordResponse> httpApi = new HttpApi<>();
-                SYFNlRequest<MedicalRecordRequest> request = new SYFNlRequest<>();
-                request.setData(medicalRecordRequest);
-
-                String a = httpApi.doPost("http://192.1.5.162:8088/api/NlService/getEmrWdList", request);
-                System.out.println(a);
-                MedicalRecordResponse medicalRecordResponse = JSON.parseObject(a, MedicalRecordResponse.class);
-
-                List<SYFMedicalRecord> syfMedicalRecordList = medicalRecordResponse.getData();
-
-                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();
-                    medicalRecord.setBehospitalCode(syfMedicalRecordList.get(j).getZYLSH());
-                    medicalRecord.setHospitalId(Long.parseLong("2"));
-                    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()));
-                    }
-                    medicalRecordList.add(medicalRecord);
-
-                    MedicalRecordContent medicalRecordContent = new MedicalRecordContent();
-                    medicalRecordContent.setRecId(syfMedicalRecordList.get(j).getWDLSH());
-                    medicalRecordContent.setHospitalId(Long.parseLong("2"));
-                    medicalRecordContent.setHtmlText(syfMedicalRecordList.get(j).getBLNR());
-                    medicalRecordContent.setXmlText(syfMedicalRecordList.get(j).getXMLWD());
-                    medicalRecordContentList.add(medicalRecordContent);
-                }
-
-
-                execute(medicalRecordContentList);
-                aMedicalRecordFacade.execute(medicalRecordList);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
+        //String sql="select * from mr_mrcontent  where cjcxrq>=dateadd(day,-2,getdate()) and cjcxrq<=getdate()";
+        String sql="select BLJLID,BLJLNR from mr_mrcontent  where cjcxrq>=(select CONVERT(varchar,GETDATE()-2,23)) and cjcxrq<(select CONVERT(varchar,GETDATE(),23)) ORDER BY cjcxrq DESC";
+        List<MedicalRecordContent> mrContentList = tzDBConn.getMedicalRecordContent(sql);
+        execute(mrContentList);
     }
 
     /**

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

@@ -1,16 +1,26 @@
 package com.diagbot.facade.data;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.AnalyzeRunDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.AMedicalRecordDTO;
 import com.diagbot.dto.data.AMrContentDTO;
 import com.diagbot.entity.*;
+import com.diagbot.entity.shaoyifu.entity.PatientInfo;
+import com.diagbot.entity.shaoyifu.entity.SYFMedicalRecord;
+import com.diagbot.entity.shaoyifu.request.MedicalRecordRequest;
+import com.diagbot.entity.shaoyifu.request.PatientListRequest;
+import com.diagbot.entity.shaoyifu.response.MedicalRecordResponse;
+import com.diagbot.entity.shaoyifu.response.PatientListResponse;
+import com.diagbot.entity.shaoyifu.util.HttpApi;
+import com.diagbot.entity.shaoyifu.util.SYFNlRequest;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.BehospitalInfoFacade;
 import com.diagbot.facade.ModelHospitalFacade;
 import com.diagbot.facade.QcTypeFacade;
 import com.diagbot.service.impl.MedicalRecordServiceImpl;
+import com.diagbot.service.impl.PatientInfoServiceImpl;
 import com.diagbot.service.impl.QcAbnormalServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
@@ -24,6 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -55,16 +66,77 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
     @Autowired
     private ReadProperties readProperties;
 
+    @Autowired
+    private APatientListFacade aPatientListFacade;
+
+    @Autowired
+    private PatientInfoServiceImpl patientInfoServiceImpl;
+
     private TZDBConn tzDBConn = new TZDBConn();
 
     /**
      * 终末质控-同步前一天的病历记录
      */
     public void executeMrRecord() {
-        //String sql="select * from mr_medicalrecords  where cjcxrq>=dateadd(day,-2,getdate()) and cjcxrq<=getdate()";
-        String sql="select * from mr_medicalrecords  where cjcxrq>=(select CONVERT(varchar,GETDATE()-2,23)) and cjcxrq<(select CONVERT(varchar,GETDATE(),23)) ORDER BY cjcxrq DESC";
-        List<MedicalRecord> medicalRecordList = tzDBConn.getMedicalRecord(sql);
-        execute(medicalRecordList);
+        try {
+            /*PatientListRequest patientListRequest = new PatientListRequest();
+            *//*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.getPatientList(patientListRequest);*/
+
+            List<PatientInfo> patientInfoList = patientInfoServiceImpl.list();
+
+            for (int i = 0; i < patientInfoList.size(); i++) {
+                MedicalRecordRequest medicalRecordRequest = new MedicalRecordRequest();
+                medicalRecordRequest.setMRN(patientInfoList.get(i).getMrn());
+                medicalRecordRequest.setSERIES(patientInfoList.get(i).getSeries());
+
+                /*medicalRecordRequest.setMRN(patientListResponse.getData().get(i).getMRN());
+                medicalRecordRequest.setSERIES(patientListResponse.getData().get(i).getSERIES());*/
+
+                HttpApi<MedicalRecordResponse> httpApi = new HttpApi<>();
+                SYFNlRequest<MedicalRecordRequest> request = new SYFNlRequest<>();
+                request.setData(medicalRecordRequest);
+
+                String a = httpApi.doPost("http://192.1.5.162:8088/api/NlService/getEmrWdList", request);
+                System.out.println(a);
+                MedicalRecordResponse medicalRecordResponse = JSON.parseObject(a, MedicalRecordResponse.class);
+
+                List<SYFMedicalRecord> syfMedicalRecordList = medicalRecordResponse.getData();
+
+                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();
+                    medicalRecord.setBehospitalCode(syfMedicalRecordList.get(j).getZYLSH());
+                    medicalRecord.setHospitalId(Long.parseLong("2"));
+                    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()));
+                    }
+                    medicalRecordList.add(medicalRecord);
+
+                    MedicalRecordContent medicalRecordContent = new MedicalRecordContent();
+                    medicalRecordContent.setRecId(syfMedicalRecordList.get(j).getWDLSH());
+                    medicalRecordContent.setHospitalId(Long.parseLong("2"));
+                    medicalRecordContent.setHtmlText(syfMedicalRecordList.get(j).getBLNR());
+                    medicalRecordContent.setXmlText(syfMedicalRecordList.get(j).getXMLWD());
+                    medicalRecordContentList.add(medicalRecordContent);
+                }
+
+                execute(medicalRecordList);
+                aMedicalRecordContentFacade.execute(medicalRecordContentList);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
     }
 
     /**

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

@@ -18,7 +18,7 @@ import java.util.Date;
 import java.util.List;
 
 @Component
-public class APatientListFacade extends PatientInfoServiceImpl{
+public class APatientListFacade extends PatientInfoServiceImpl {
 
     @Autowired
     @Qualifier("patientInfoServiceImpl")
@@ -27,11 +27,10 @@ public class APatientListFacade extends PatientInfoServiceImpl{
     /**
      * 获取保存一段时间内归档的患者信息 已到六月二十二日
      */
-    public PatientListResponse getPatientList1() {
+    public PatientListResponse savePatientList(PatientListRequest patientListRequest) {
 
-        PatientListRequest patientListRequest = new PatientListRequest();
-        patientListRequest.setDATESTART("2020-06-17 00:00:00");
-        patientListRequest.setDATEEND("2020-06-23 00:00:00");
+        /*patientListRequest.setDATESTART("2020-06-17 00:00:00");
+        patientListRequest.setDATEEND("2020-06-23 00:00:00");*/
 
         SYFNlRequest<PatientListRequest> request = new SYFNlRequest<>();
         request.setData(patientListRequest);
@@ -51,22 +50,24 @@ public class APatientListFacade extends PatientInfoServiceImpl{
                     patientInfo.setMrn(sYFPatientList.get(i).getMRN());
                     patientInfo.setSeries(sYFPatientList.get(i).getSERIES());
                     patientList.add(patientInfo);
+                }
 
+                if (patientList.size() > 0) {
+                    patientList.stream().forEach(s -> {
+                        QueryWrapper<PatientInfo> queryWrapper = new QueryWrapper<>();
+                        queryWrapper.eq("behospital_code", (s.getBehospitalCode()));
+                        PatientInfo patientInfo1 = patientInfoServiceImpl.getOne(queryWrapper);
+                        if (patientInfo1 != null) {
+                            s.setGmtModified(new Date());
+                            patientInfoServiceImpl.updateById(s);
+                        } else {
+                            s.setGmtCreate(new Date());
+                            patientInfoServiceImpl.save(s);
+                        }
+                    });
                 }
             }
 
-            patientList.stream().forEach(s -> {
-                QueryWrapper<PatientInfo> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("behospital_code", (s.getBehospitalCode()));
-                PatientInfo patientInfo1 = patientInfoServiceImpl.getOne(queryWrapper);
-                if (patientInfo1 != null) {
-                    s.setGmtModified(new Date());
-                    patientInfoServiceImpl.updateById(s);
-                } else {
-                    s.setGmtCreate(new Date());
-                    patientInfoServiceImpl.save(s);
-                }
-            });
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -94,4 +95,5 @@ public class APatientListFacade extends PatientInfoServiceImpl{
 
         return response;
     }
+
 }

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

@@ -0,0 +1,36 @@
+package com.diagbot.facade.data;
+
+import org.springframework.stereotype.Component;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+
+@Component
+public class DateFacade {
+
+    public Date getStartDate(){
+
+        Calendar start = Calendar.getInstance();
+        start.setTime(new Date());
+        start.set(Calendar.DATE, start.get(Calendar.DATE) - 1);
+        start.set(Calendar.HOUR_OF_DAY, 0);
+        start.set(Calendar.MINUTE, 0);
+        start.set(Calendar.SECOND, 0);
+        Date startTime = start.getTime();
+
+        return startTime;
+    }
+
+    public Date getEndDate(){
+        Calendar end = Calendar.getInstance();
+        end.setTime(new Date());
+        end.set(Calendar.DATE, end.get(Calendar.DATE));
+        end.set(Calendar.HOUR_OF_DAY, 0);
+        end.set(Calendar.MINUTE, 0);
+        end.set(Calendar.SECOND, 0);
+        Date endTime = end.getTime();
+
+        return endTime;
+    }
+}

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

@@ -0,0 +1,39 @@
+package com.diagbot.web;
+
+
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.entity.shaoyifu.request.PatientListRequest;
+import com.diagbot.facade.data.APatientListFacade;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author lipc
+ * @since 2020-06-22
+ */
+@RestController
+@RequestMapping("/base/patientInfo")
+@Api(value = "患者列表", tags = { "患者列表API" })
+@SuppressWarnings("unchecked")
+public class PatientinfoController {
+
+    @Autowired
+    APatientListFacade aPatientListFacade;
+
+    @ApiOperation(value = "获取并保存一段时间内归档的患者信息",
+            notes = "inputStr: 时间")
+    @PostMapping("/savePatientList")
+    @SysLogger("savePatientList")
+    public void getPatientList(@RequestBody  PatientListRequest patientListRequest) {
+        aPatientListFacade.savePatientList(patientListRequest);
+    }
+}

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.1.3.141:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
       username: root
-      password: lantone
+      password: langtong
       # 连接池的配置信息
       # 初始化大小，最小，最大
       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: 127.0.0.1  #Redis服务器地址
+    port: 6379 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password: lantone # Redis服务器连接密码（默认为空）
     lettuce:
       pool:
@@ -161,11 +161,11 @@ io.github.lvyahui8.spring:
 
 myhost: localhost
 oath.self.address: http://${myhost}:${server.port}
-qc.address: http://192.168.2.232:6009
+qc.address: http://127.0.0.1:6009
 
 # 加解密开关
 encrypt:
-  enable: true
+  enable: false
 
 swagger:
   enable: true

src/main/resources/mapper/PatientInfoMapper.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diagbot.mapper.PatientInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.shaoyifu.entity.PatientInfo">
+        <id column="id" property="id" />
+        <result column="behospital_code" property="behospitalCode" />
+        <result column="rdn" property="rdn" />
+        <result column="mrn" property="mrn" />
+        <result column="series" property="series" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+    </resultMap>
+
+</mapper>