义乌妇保补录接口更新

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

@@ -29,7 +29,7 @@ import java.util.Map;
 import java.util.regex.Pattern;
 
 @Component
-public class AHomePageFacade extends HomePageServiceImpl{
+public class AHomePageFacade extends HomePageServiceImpl {
 
     @Autowired
     @Qualifier("homePageServiceImpl")
@@ -75,50 +75,55 @@ public class AHomePageFacade extends HomePageServiceImpl{
         execute(homePageList);
     }
 
-    public RespDTO updateHomePage(String behospitalCode, String startDate, String endDate){
+    public RespDTO updateHomePage(String behospitalCode, String startDate, String endDate) {
         try {
             //验证数据是否存在
-            if(StringUtil.isNotBlank(behospitalCode)){
-                String sql = "SELECT * FROM ai_v_sendhomepageing t WHERE t.BEHOSPITALDATE ='" + behospitalCode + "'";
-                sql = sql.replace("\"","");
+            if (StringUtil.isNotBlank(behospitalCode)) {
+                String sql = "SELECT * FROM ai_v_sendhomepageing t WHERE t.BEHOSPITALCODE ='" + behospitalCode + "'";
+                sql = sql.replace("\"", "");
                 List<HomePage> homePageList = tzDBConn.getHomePage(sql);
-                if(homePageList.size() == 0){
+                aMedAbnormalInfoFacade.saveAbnormalInfo("updateHomePage","按照住院号查询", sql, JSON.toJSONString(homePageList), "");
+                if (homePageList.size() == 0) {
                     return RespDTO.onSuc(false);
                 }
                 execute(homePageList);
                 return RespDTO.onSuc(true);
             } else {
-                String sql = "SELECT * FROM ai_v_sendhomepageing t WHERE t.BEHOSPITALDATE >=to_date('" + startDate
-                        + "','yyyy-mm-dd') and t.BEHOSPITALDATE < to_date('" + endDate + "','yyyy-mm-dd')";
-                sql = sql.replace("\"","");
+//                String sql = "SELECT * FROM ai_v_sendhomepageing t WHERE t.BEHOSPITALDATE >=to_date('" + startDate
+//                        + "','yyyy-mm-dd') and t.BEHOSPITALDATE < to_date('" + endDate + "','yyyy-mm-dd')";
+                String sql = "select * from ai_v_sendhomepageing t where to_char(t.behospitalDate,'yyyymmdd')>= '" + startDate + "'" +
+                        " and to_char(t.behospitalDate,'yyyymmdd')<= '" + endDate + "'";
+                sql = sql.replace("\"", "");
                 List<HomePage> homePageList = tzDBConn.getHomePage(sql);
-                if(homePageList.size() == 0){
+                aMedAbnormalInfoFacade.saveAbnormalInfo("updateHomePage","按照日期查询", sql, JSON.toJSONString(homePageList), "");
+                if (homePageList.size() == 0) {
                     return RespDTO.onSuc(false);
                 }
                 execute(homePageList);
                 return RespDTO.onSuc(true);
             }
 
-        }catch (Exception e){
+        } catch (Exception e) {
             return RespDTO.onError(e.getMessage());
         }
     }
 
     /**
      * 运行质控-验证数据有效性
+     *
      * @param aHomePageIngVO
      * @return
      */
-    public RespDTO<Map<String, Object>> executeHomePageIng(AHomePageIngVO aHomePageIngVO){
+    public RespDTO<Map<String, Object>> executeHomePageIng(AHomePageIngVO aHomePageIngVO) {
         try {
-            if(aHomePageIngVO.getHomePages()!=null && aHomePageIngVO.getHomePages().size()>0){
+            if (aHomePageIngVO.getHomePages() != null && aHomePageIngVO.getHomePages().size() > 0) {
                 //验证数据有效性
-                for (AHomePageVO aHomePageVO:aHomePageIngVO.getHomePages()) {
-                    if(StringUtil.isEmpty(aHomePageVO.getHomePageId())) {
+                for (AHomePageVO aHomePageVO : aHomePageIngVO.getHomePages()) {
+                    if (StringUtil.isEmpty(aHomePageVO.getHomePageId())) {
                         return RespDTO.onError("请输入病案首页编号!");
-                    }else if(aHomePageVO.getHospitalId()==null){
+                    } else if (aHomePageVO.getHospitalId() == null) {
                         return RespDTO.onError("请输入医院编码!");
-                    }else if(StringUtil.isEmpty(aHomePageVO.getBehospitalCode())){
+                    } else if (StringUtil.isEmpty(aHomePageVO.getBehospitalCode())) {
                         return RespDTO.onError("请输入病人住院编码!");
                     }
                     //更新病案首页记录创建时间
@@ -130,26 +135,27 @@ public class AHomePageFacade extends HomePageServiceImpl{
                     aHomePageVO.setGmtCreate(String.valueOf(medicalRecord.getRecDate()));
                     aHomePageVO.setGmtModified(String.valueOf(medicalRecord.getRecDate()));
                     //出院诊断
-                    if(aHomePageVO.getLeaveDiags()!=null && aHomePageVO.getLeaveDiags().size()>0){
-                        for (AHomeDiagnoseVO aHomeDiagnoseVO:aHomePageVO.getLeaveDiags()){
-                            if(StringUtil.isEmpty(aHomeDiagnoseVO.getHomePageId())) {
+                    if (aHomePageVO.getLeaveDiags() != null && aHomePageVO.getLeaveDiags().size() > 0) {
+                        for (AHomeDiagnoseVO aHomeDiagnoseVO : aHomePageVO.getLeaveDiags()) {
+                            if (StringUtil.isEmpty(aHomeDiagnoseVO.getHomePageId())) {
                                 return RespDTO.onSuc("出院诊断未输入病案首页编号!");
-                            }else if(aHomeDiagnoseVO.getHospitalId()==null){
+                            } else if (aHomeDiagnoseVO.getHospitalId() == null) {
                                 return RespDTO.onSuc("出院诊断未输入医院编码!");
-                            }else if(StringUtil.isEmpty(aHomeDiagnoseVO.getDiagnoseOrderNo())){
+                            } else if (StringUtil.isEmpty(aHomeDiagnoseVO.getDiagnoseOrderNo())) {
                                 return RespDTO.onSuc("出院诊断未输入顺序号!");
                             }
                         }
-                    };
+                    }
+                    ;
 
                     //住院手术
-                    if(aHomePageVO.getOperations()!=null && aHomePageVO.getOperations().size()>0){
-                        for (AHomeOperationVO aHomeOperationVO:aHomePageVO.getOperations()){
-                            if(StringUtil.isEmpty(aHomeOperationVO.getHomePageId())) {
+                    if (aHomePageVO.getOperations() != null && aHomePageVO.getOperations().size() > 0) {
+                        for (AHomeOperationVO aHomeOperationVO : aHomePageVO.getOperations()) {
+                            if (StringUtil.isEmpty(aHomeOperationVO.getHomePageId())) {
                                 return RespDTO.onSuc("住院手术未输入病案首页编号!");
-                            }else if(aHomeOperationVO.getHospitalId()==null){
+                            } else if (aHomeOperationVO.getHospitalId() == null) {
                                 return RespDTO.onSuc("住院手术未输入医院编码!");
-                            }else if(StringUtil.isEmpty(aHomeOperationVO.getOperationOrderNo())){
+                            } else if (StringUtil.isEmpty(aHomeOperationVO.getOperationOrderNo())) {
                                 return RespDTO.onSuc("住院手术未输入顺序号!");
                             }
                         }
@@ -160,15 +166,15 @@ public class AHomePageFacade extends HomePageServiceImpl{
                 updateHomePageIng(aHomePageIngVO);
                 //评分后返回结构体
                 return homePageIng(aHomePageIngVO);
-            }else{
-                aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页","",JSON.toJSONString(aHomePageIngVO),"","未接收到数据!");
+            } else {
+                aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页", "", JSON.toJSONString(aHomePageIngVO), "", "未接收到数据!");
                 return RespDTO.onError("未接收到数据!");
             }
-        }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页","",JSON.toJSONString(aHomePageIngVO),"",e.getMessage());
-            if(e.getMessage().contains("该病历无关联的质控条目")){
+        } catch (Exception e) {
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页", "", JSON.toJSONString(aHomePageIngVO), "", e.getMessage());
+            if (e.getMessage().contains("该病历无关联的质控条目")) {
                 return RespDTO.onSuc(e.getMessage());
-            }else {
+            } else {
                 return RespDTO.onError(e.getMessage());
             }
         }
@@ -176,16 +182,17 @@ public class AHomePageFacade extends HomePageServiceImpl{
 
     /**
      * 更新数据到数据库
+     *
      * @param aHomePageIngVO
      */
-    public void updateHomePageIng(AHomePageIngVO aHomePageIngVO){
+    public void updateHomePageIng(AHomePageIngVO aHomePageIngVO) {
         try {
-            List<HomePage> homePageList=Lists.newArrayList();
-            aHomePageIngVO.getHomePages().stream().forEach(s->{
+            List<HomePage> homePageList = Lists.newArrayList();
+            aHomePageIngVO.getHomePages().stream().forEach(s -> {
                 //初始化入参
-                HomePage homePage=new HomePage();
-                BeanUtil.copyProperties(s,homePage);
-                if(StringUtil.isNotEmpty(s.getSex()) && Pattern.compile("^[-\\+]?[\\d]*$").matcher(s.getSex()).matches()){
+                HomePage homePage = new HomePage();
+                BeanUtil.copyProperties(s, homePage);
+                if (StringUtil.isNotEmpty(s.getSex()) && Pattern.compile("^[-\\+]?[\\d]*$").matcher(s.getSex()).matches()) {
                     //性别，1：男，2：女
                     homePage.setSex(SexEnum.getName(s.getSex()));
                 }
@@ -193,80 +200,80 @@ public class AHomePageFacade extends HomePageServiceImpl{
 //                    //性别，1：男，2：女
 //                    homePage.setSex(SexEnum.getName(s.getSex()));
 //                }
-                if(StringUtil.isNotEmpty(s.getMarriage()) && Pattern.compile("^[-\\+]?[\\d]*$").matcher(s.getMarriage()).matches()){
+                if (StringUtil.isNotEmpty(s.getMarriage()) && Pattern.compile("^[-\\+]?[\\d]*$").matcher(s.getMarriage()).matches()) {
                     //婚姻，1：未婚，2：已婚，3：丧偶，4：离婚，9：其他
                     homePage.setMarriage(MarriageEnum.getName(s.getMarriage()));
                 }
-                if(StringUtil.isNotEmpty(s.getIsMedAllergy())){
+                if (StringUtil.isNotEmpty(s.getIsMedAllergy())) {
                     //过敏史，1：无，2：有
                     homePage.setIsMedAllergy(IsMedAllergyEnum.getName(s.getIsMedAllergy()));
                 }
-                if(StringUtil.isNotEmpty(s.getBehospitalWay()) && Pattern.compile("^[-\\+]?[\\d]*$").matcher(s.getBehospitalWay()).matches()){
+                if (StringUtil.isNotEmpty(s.getBehospitalWay()) && Pattern.compile("^[-\\+]?[\\d]*$").matcher(s.getBehospitalWay()).matches()) {
                     //入院途径，1：急诊，2：门诊，3：其他医疗机构，9：其他
                     homePage.setBehospitalWay(BehospitalWayEnum.getName(s.getBehospitalWay()));
                 }
-                if(StringUtil.isNotEmpty(s.getAutopsy())){
+                if (StringUtil.isNotEmpty(s.getAutopsy())) {
                     //死亡患者尸检，1：是，2：否
                     homePage.setAutopsy(AutopsyEnum.getName(s.getAutopsy()));
                 }
-                if(StringUtil.isNotEmpty(s.getBloodType())){
+                if (StringUtil.isNotEmpty(s.getBloodType())) {
                     //血型，1：A，2:B，3:O，4:AB，5:不详，6:未查
                     homePage.setBloodType(BloodTypeEnum.getName(s.getBloodType()));
                 }
-                if(StringUtil.isNotEmpty(s.getRh())){
+                if (StringUtil.isNotEmpty(s.getRh())) {
                     //RH,1:阴，2：阳，3，不详，4，未查
                     homePage.setRh(RHEnum.getName(s.getRh()));
                 }
-                if(StringUtil.isNotEmpty(s.getLeaveHospitalType())){
+                if (StringUtil.isNotEmpty(s.getLeaveHospitalType())) {
                     //离院方式,1：医院离院，2：医嘱转院,3:医嘱转社区卫生服务机构/乡镇卫生院，4:非医嘱离院,5:死亡，9:其他
                     homePage.setLeaveHospitalType(LeaveHospitalTypeEnum.getName(s.getLeaveHospitalType()));
                 }
-                if(StringUtil.isNotEmpty(s.getSingleDiagManage())){
+                if (StringUtil.isNotEmpty(s.getSingleDiagManage())) {
                     //单病种管理：1：有，2：无
                     homePage.setSingleDiagManage(SingleDiagManageEnum.getName(s.getSingleDiagManage()));
                 }
-                if(StringUtil.isNotEmpty(s.getClinicPathwayManage())){
+                if (StringUtil.isNotEmpty(s.getClinicPathwayManage())) {
                     //临床路径管理，1：完成，2：变异，3：退出，4：未入
                     homePage.setClinicPathwayManage(ClinicPathwayManageEnum.getName(s.getClinicPathwayManage()));
                 }
-                if(StringUtil.isNotEmpty(s.getReturnToType())){
+                if (StringUtil.isNotEmpty(s.getReturnToType())) {
                     //转归情况，1：治愈，2：好转，3：未愈，4：死亡，9：其他
                     homePage.setReturnToType(ReturnToTypeEnum.getName(s.getReturnToType()));
                 }
-                if(StringUtil.isNotEmpty(s.getIsOutpatientBehospital())){
+                if (StringUtil.isNotEmpty(s.getIsOutpatientBehospital())) {
                     homePage.setIsOutpatientBehospital(DiagnoseTypeEnum.getName(s.getIsOutpatientBehospital()));
                 }
-                if(StringUtil.isNotEmpty(s.getIsLeaveBehospital())){
+                if (StringUtil.isNotEmpty(s.getIsLeaveBehospital())) {
                     homePage.setIsLeaveBehospital(DiagnoseTypeEnum.getName(s.getIsLeaveBehospital()));
                 }
-                if(StringUtil.isNotEmpty(s.getIsOperationBeforeAfter())){
+                if (StringUtil.isNotEmpty(s.getIsOperationBeforeAfter())) {
                     homePage.setIsOperationBeforeAfter(DiagnoseTypeEnum.getName(s.getIsOperationBeforeAfter()));
                 }
-                if(StringUtil.isNotEmpty(s.getIsClinicPathology())){
+                if (StringUtil.isNotEmpty(s.getIsClinicPathology())) {
                     homePage.setIsClinicPathology(DiagnoseTypeEnum.getName(s.getIsClinicPathology()));
                 }
-                if(StringUtil.isNotEmpty(s.getIsRadiatePathology())){
+                if (StringUtil.isNotEmpty(s.getIsRadiatePathology())) {
                     homePage.setIsRadiatePathology(DiagnoseTypeEnum.getName(s.getIsRadiatePathology()));
                 }
-                if(StringUtil.isNotEmpty(s.getAgainBehospitalPlan())){
+                if (StringUtil.isNotEmpty(s.getAgainBehospitalPlan())) {
                     /**31天再住院计划*/
                     homePage.setAgainBehospitalPlan(IsMedAllergyEnum.getName(s.getAgainBehospitalPlan()));
                 }
-                if(StringUtil.isNotEmpty(s.getHomePageQuality())){
+                if (StringUtil.isNotEmpty(s.getHomePageQuality())) {
                     /**病案质量，1：甲，2：乙，3：丙*/
                     homePage.setHomePageQuality(medicalRecordQualityEnum.getName(s.getHomePageQuality()));
                 }
-                if(StringUtil.isNotBlank(s.getBirthday())){
-                    homePage.setBirthday(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getBirthday(),"yyyy-MM-dd"))));
+                if (StringUtil.isNotBlank(s.getBirthday())) {
+                    homePage.setBirthday(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getBirthday(), "yyyy-MM-dd"))));
                 }
-                if(StringUtil.isNotBlank(s.getBehospitalDate())){
-                    homePage.setBehospitalDate(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getBehospitalDate(),"yyyy-MM-dd HH:mm"))));
+                if (StringUtil.isNotBlank(s.getBehospitalDate())) {
+                    homePage.setBehospitalDate(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getBehospitalDate(), "yyyy-MM-dd HH:mm"))));
                 }
-                if(StringUtil.isNotBlank(s.getLeaveHospitalDate())){
-                    homePage.setLeaveHospitalDate(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getLeaveHospitalDate(),"yyyy-MM-dd HH:mm"))));
+                if (StringUtil.isNotBlank(s.getLeaveHospitalDate())) {
+                    homePage.setLeaveHospitalDate(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getLeaveHospitalDate(), "yyyy-MM-dd HH:mm"))));
                 }
-                if(StringUtil.isNotBlank(s.getQcDate())){
-                    homePage.setQcDate(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getQcDate(),"yyyy-MM-dd"))));
+                if (StringUtil.isNotBlank(s.getQcDate())) {
+                    homePage.setQcDate(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getQcDate(), "yyyy-MM-dd"))));
                 }
                 homePageList.add(homePage);
 
@@ -276,67 +283,68 @@ public class AHomePageFacade extends HomePageServiceImpl{
             });
             execute(homePageList);
             //aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页",JSON.toJSONString(aHomePageIngVO),"","操作成功!");
-        }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页","",JSON.toJSONString(aHomePageIngVO),"",e.getMessage());
+        } catch (Exception e) {
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页", "", JSON.toJSONString(aHomePageIngVO), "", e.getMessage());
         }
     }
 
     /**
      * 评分后返回结构体
+     *
      * @param aHomePageIngVO
      * @return
      */
-    private RespDTO<Map<String, Object>> homePageIng(AHomePageIngVO aHomePageIngVO){
+    private RespDTO<Map<String, Object>> homePageIng(AHomePageIngVO aHomePageIngVO) {
         try {
-            String behospitalCode =aHomePageIngVO.getHomePages().get(0).getBehospitalCode();
-            Long hospitalId=aHomePageIngVO.getHomePages().get(0).getHospitalId();
-            Long modeId=Long.valueOf("6");//病案首页默认为6
-            if(aHomePageIngVO.getDockModeType().equals("0")){
-                Map<String,Object> map=new HashMap<String,Object>();
-                List<AHomePageDTO> homePageDtoList=BeanUtil.listCopyTo(aHomePageIngVO.getHomePages(),AHomePageDTO.class);
-                map.put("homePages",homePageDtoList);
+            String behospitalCode = aHomePageIngVO.getHomePages().get(0).getBehospitalCode();
+            Long hospitalId = aHomePageIngVO.getHomePages().get(0).getHospitalId();
+            Long modeId = Long.valueOf("6");//病案首页默认为6
+            if (aHomePageIngVO.getDockModeType().equals("0")) {
+                Map<String, Object> map = new HashMap<String, Object>();
+                List<AHomePageDTO> homePageDtoList = BeanUtil.listCopyTo(aHomePageIngVO.getHomePages(), AHomePageDTO.class);
+                map.put("homePages", homePageDtoList);
                 //aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页",JSON.toJSONString(aHomePageIngVO),JSON.toJSONString(RespDTO.onSuc(map)),"操作成功!");
                 return RespDTO.onSuc(map);
-            }else if(aHomePageIngVO.getDockModeType().equals("1")){
+            } else if (aHomePageIngVO.getDockModeType().equals("1")) {
                 //页面模式
-                String url=readProperties.getProcessQcUrl()+"?behospitalCode="+behospitalCode+"&hospitalId="+hospitalId+"&modeId="+modeId;
-                Map<String,Object> map=new HashMap<String,Object>();
-                map.put("url",url);
+                String url = readProperties.getProcessQcUrl() + "?behospitalCode=" + behospitalCode + "&hospitalId=" + hospitalId + "&modeId=" + modeId;
+                Map<String, Object> map = new HashMap<String, Object>();
+                map.put("url", url);
                 //aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页",JSON.toJSONString(aHomePageIngVO),JSON.toJSONString(RespDTO.onSuc(map)),"操作成功!");
                 return RespDTO.onSuc(map);
-            }else if(aHomePageIngVO.getDockModeType().equals("2")){
-                AnalyzeRunVO analyzeRunVO=new AnalyzeRunVO();
+            } else if (aHomePageIngVO.getDockModeType().equals("2")) {
+                AnalyzeRunVO analyzeRunVO = new AnalyzeRunVO();
                 analyzeRunVO.setBehospitalCode(behospitalCode);
                 analyzeRunVO.setHospitalId(hospitalId);
                 analyzeRunVO.setModeId(modeId);
-                AnalyzeRunDTO analyzeRunDTO=behospitalInfoFacade.analyzeRun(analyzeRunVO);
-                Map<String,Object> map=new HashMap<String,Object>();
-                if(analyzeRunDTO.getMsgDTOList().size()>0){
-                    map.put("analyze",analyzeRunDTO.getMsgDTOList());
+                AnalyzeRunDTO analyzeRunDTO = behospitalInfoFacade.analyzeRun(analyzeRunVO);
+                Map<String, Object> map = new HashMap<String, Object>();
+                if (analyzeRunDTO.getMsgDTOList().size() > 0) {
+                    map.put("analyze", analyzeRunDTO.getMsgDTOList());
                 }
                 //aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页",JSON.toJSONString(aHomePageIngVO),JSON.toJSONString(RespDTO.onSuc(map)),"操作成功!");
                 return RespDTO.onSuc(map);
-            }else{
+            } else {
                 //页面模式+接口引擎模式
-                String url=readProperties.getProcessQcUrl()+"?behospitalCode="+behospitalCode+"&hospitalId="+hospitalId+"&modeId="+modeId;
-                AnalyzeRunVO analyzeRunVO=new AnalyzeRunVO();
+                String url = readProperties.getProcessQcUrl() + "?behospitalCode=" + behospitalCode + "&hospitalId=" + hospitalId + "&modeId=" + modeId;
+                AnalyzeRunVO analyzeRunVO = new AnalyzeRunVO();
                 analyzeRunVO.setBehospitalCode(behospitalCode);
                 analyzeRunVO.setHospitalId(hospitalId);
                 analyzeRunVO.setModeId(modeId);
-                AnalyzeRunDTO analyzeRunDTO=behospitalInfoFacade.analyzeRun(analyzeRunVO);
-                Map<String,Object> map=new HashMap<String,Object>();
-                if(analyzeRunDTO.getMsgDTOList().size()>0){
-                    map.put("url",url);
-                    map.put("analyze",analyzeRunDTO.getMsgDTOList());
+                AnalyzeRunDTO analyzeRunDTO = behospitalInfoFacade.analyzeRun(analyzeRunVO);
+                Map<String, Object> map = new HashMap<String, Object>();
+                if (analyzeRunDTO.getMsgDTOList().size() > 0) {
+                    map.put("url", url);
+                    map.put("analyze", analyzeRunDTO.getMsgDTOList());
                 }
                 //aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页",JSON.toJSONString(aHomePageIngVO),JSON.toJSONString(RespDTO.onSuc(map)),"操作成功!");
                 return RespDTO.onSuc(map);
             }
-        }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页","",JSON.toJSONString(aHomePageIngVO),"",e.getMessage());
-            if(e.getMessage().contains("该病历无关联的质控条目")){
+        } catch (Exception e) {
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页", "", JSON.toJSONString(aHomePageIngVO), "", e.getMessage());
+            if (e.getMessage().contains("该病历无关联的质控条目")) {
                 return RespDTO.onSuc(e.getMessage());
-            }else {
+            } else {
                 return RespDTO.onError(e.getMessage());
             }
         }
@@ -345,60 +353,62 @@ public class AHomePageFacade extends HomePageServiceImpl{
 
     /**
      * 终末质控-通过接口更新病案首页
+     *
      * @param list
      * @return
      */
     public RespDTO<List<AHomePageDTO>> executeHomePage(List<AHomePageVO> list) {
         try {
-            if(list!=null && list.size()>0){
+            if (list != null && list.size() > 0) {
                 //循环验证数据有效性
-                for (AHomePageVO aHomePageVO:list) {
-                    if(StringUtil.isEmpty(aHomePageVO.getHomePageId())) {
+                for (AHomePageVO aHomePageVO : list) {
+                    if (StringUtil.isEmpty(aHomePageVO.getHomePageId())) {
                         return RespDTO.onError("请输入病案首页编号!");
-                    }else if(aHomePageVO.getHospitalId()==null){
+                    } else if (aHomePageVO.getHospitalId() == null) {
                         return RespDTO.onError("请输入医院编码!");
-                    }else if(StringUtil.isEmpty(aHomePageVO.getBehospitalCode())){
+                    } else if (StringUtil.isEmpty(aHomePageVO.getBehospitalCode())) {
                         return RespDTO.onError("请输入病人住院编码!");
                     }
                 }
                 //装载数据
-                List<HomePage> homePageList=Lists.newArrayList();
-                list.stream().forEach(s->{
+                List<HomePage> homePageList = Lists.newArrayList();
+                list.stream().forEach(s -> {
                     //初始化入参
-                    HomePage homePage=new HomePage();
-                    BeanUtil.copyProperties(s,homePage);
-                    if(StringUtil.isNotBlank(s.getBirthday())){
-                        homePage.setBirthday(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getBirthday(),"yyyy/MM/dd"))));
+                    HomePage homePage = new HomePage();
+                    BeanUtil.copyProperties(s, homePage);
+                    if (StringUtil.isNotBlank(s.getBirthday())) {
+                        homePage.setBirthday(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getBirthday(), "yyyy/MM/dd"))));
                     }
-                    if(StringUtil.isNotBlank(s.getBehospitalDate())){
-                        homePage.setBehospitalDate(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getBehospitalDate(),"yyyy/MM/dd HH:mm"))));
+                    if (StringUtil.isNotBlank(s.getBehospitalDate())) {
+                        homePage.setBehospitalDate(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getBehospitalDate(), "yyyy/MM/dd HH:mm"))));
                     }
-                    if(StringUtil.isNotBlank(s.getLeaveHospitalDate())){
-                        homePage.setLeaveHospitalDate(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getLeaveHospitalDate(),"yyyy/MM/dd HH:mm"))));
+                    if (StringUtil.isNotBlank(s.getLeaveHospitalDate())) {
+                        homePage.setLeaveHospitalDate(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getLeaveHospitalDate(), "yyyy/MM/dd HH:mm"))));
                     }
-                    if(StringUtil.isNotBlank(s.getQcDate())){
-                        homePage.setQcDate(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getQcDate(),"yyyy/MM/dd"))));
+                    if (StringUtil.isNotBlank(s.getQcDate())) {
+                        homePage.setQcDate(DateUtil.parseDateTime(DateUtil.formatDateTime(DateUtil.parseDate(s.getQcDate(), "yyyy/MM/dd"))));
                     }
                     homePageList.add(homePage);
                 });
                 execute(homePageList);
-                List<AHomePageDTO> homePageDtoList=BeanUtil.listCopyTo(list,AHomePageDTO.class);
+                List<AHomePageDTO> homePageDtoList = BeanUtil.listCopyTo(list, AHomePageDTO.class);
                 return RespDTO.onSuc(homePageDtoList);
-            }else{
-                aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页","",JSON.toJSONString(list),"","未接收到数据!");
+            } else {
+                aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页", "", JSON.toJSONString(list), "", "未接收到数据!");
                 return RespDTO.onError("未接收到数据!");
             }
-        }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页","",JSON.toJSONString(list),"",e.getMessage());
+        } catch (Exception e) {
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页", "", JSON.toJSONString(list), "", e.getMessage());
             return RespDTO.onError(e.getMessage());
         }
     }
 
     /**
      * 病案首页
+     *
      * @param homePageList
      */
-    public void execute(List<HomePage> homePageList){
+    public void execute(List<HomePage> homePageList) {
         try {
             List<HomePage> addE = Lists.newLinkedList();
             List<HomePage> updateE = Lists.newLinkedList();
@@ -409,7 +419,7 @@ public class AHomePageFacade extends HomePageServiceImpl{
                             .eq("hospital_id", s.getHospitalId())
                             .eq("behospital_code", s.getBehospitalCode()), false);
                     if (homePage != null) {
-                        if(homePage.getIsDeleted().equals("Y")){
+                        if (homePage.getIsDeleted().equals("Y")) {
                             s.setIsDeleted("N");
                         }
                         s.setGmtModified(new Date());
@@ -420,41 +430,41 @@ public class AHomePageFacade extends HomePageServiceImpl{
                     }
                 });
             }
-            if(addE.size()>0){
+            if (addE.size() > 0) {
                 homePageService.saveBatch(addE);
             }
-            if(updateE.size()>0){
+            if (updateE.size() > 0) {
                 homePageService.updateBatchByKey(updateE);
             }
             //aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页",JSON.toJSONString(homePageList),"","操作成功!");
-        }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页","",JSON.toJSONString(homePageList),"",e.getMessage());
+        } catch (Exception e) {
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页", "", JSON.toJSONString(homePageList), "", e.getMessage());
         }
     }
 
-    public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
+    public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO) {
         try {
             //验证数据是否存在
-            if(StringUtil.isEmpty(aDeleteFlagVO.getHomePageId())) {
+            if (StringUtil.isEmpty(aDeleteFlagVO.getHomePageId())) {
                 return RespDTO.onError("请输入病案首页编号!");
-            }else if(aDeleteFlagVO.getHospitalId()==null){
+            } else if (aDeleteFlagVO.getHospitalId() == null) {
                 return RespDTO.onError("请输入医院编码!");
-            }else if(StringUtil.isEmpty(aDeleteFlagVO.getBehospitalCode())){
+            } else if (StringUtil.isEmpty(aDeleteFlagVO.getBehospitalCode())) {
                 return RespDTO.onError("请输入病人住院编码!");
-            }else {
-                UpdateWrapper<HomePage> updateWrapper=new UpdateWrapper<>();
+            } else {
+                UpdateWrapper<HomePage> updateWrapper = new UpdateWrapper<>();
                 updateWrapper.eq("home_page_id", aDeleteFlagVO.getHomePageId())
                         .eq("hospital_id", aDeleteFlagVO.getHospitalId())
                         .eq("behospital_code", aDeleteFlagVO.getBehospitalCode())
-                        .eq("is_deleted",IsDeleteEnum.N)
-                        .set("is_deleted",IsDeleteEnum.Y)
+                        .eq("is_deleted", IsDeleteEnum.N)
+                        .set("is_deleted", IsDeleteEnum.Y)
                         .set("gmt_modified", DateUtil.now());
-                Boolean flag=update(new HomePage(),updateWrapper);
+                Boolean flag = update(new HomePage(), updateWrapper);
                 //aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-删除",JSON.toJSONString(aDeleteFlagVO),JSON.toJSONString(RespDTO.onSuc(flag)),"操作成功!");
                 return RespDTO.onSuc(flag);
             }
-        }catch (Exception e){
-            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-删除",aDeleteFlagVO.getRecId(), JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
+        } catch (Exception e) {
+            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页-删除", aDeleteFlagVO.getRecId(), JSON.toJSONString(aDeleteFlagVO), "", e.getMessage());
             return RespDTO.onError(e.getMessage());
         }
     }

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

@@ -79,7 +79,7 @@ public class SendDataDealFacade {
 //            String sql = "select * from   AI_V_SENDPATIENTINFO where behospitalCode = '"+code+"'";
             String sql = "SELECT * FROM AI_V_SENDPATIENTINFO t WHERE t.BEHOSPITALCODE='" + code + "'";
             behospitalInfos = tzDBConn.getBehospitalInfo(sql);
-
+            aMedAbnormalInfoFacade.saveAbnormalInfo("sendDataDealOne","按照住院号查询", sql, "", "");
             if (StringUtil.isNotBlank(doctorID) && doctorID.equals("1")) {
                 //拉取时更新各医生姓名
                 for (BehospitalInfo info : behospitalInfos) {
@@ -126,6 +126,7 @@ public class SendDataDealFacade {
                 sql = "select * from AI_V_SENDPATIENTINFO t where to_char(t.behospitalDate,'yyyymmdd')>= '" + startDate + " ' " +
                         " and to_char(t.behospitalDate,'yyyymmdd')<= '" + stopDate + " '";
             }
+            aMedAbnormalInfoFacade.saveAbnormalInfo("sendDataDeal","按照日期查询", sql, "", "");
             behospitalInfos = tzDBConn.getBehospitalInfo(sql);
 
             if (StringUtil.isNotBlank(doctorID) && doctorID.equals("1")) {