فهرست منبع

增加日志,增加删除接口

lantone 5 سال پیش
والد
کامیت
4479a3997c

+ 22 - 17
src/main/java/com/diagbot/facade/data/ADoctorAdviceFacade.java

@@ -125,24 +125,29 @@ public class ADoctorAdviceFacade extends DoctorAdviceServiceImpl{
     }
 
     public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
-        //验证数据是否存在
-        if(StringUtil.isNotBlank(aDeleteFlagVO.getDoctorAdviceId())) {
-            return RespDTO.onError("请输入病人医嘱编码!");
-        }else if(aDeleteFlagVO.getHospitalId()==null){
-            return RespDTO.onError("请输入医院编码!");
-        }else if(StringUtil.isNotBlank(aDeleteFlagVO.getBehospitalCode())){
-            return RespDTO.onError("请输入病人住院编码!");
-        }else {
-            UpdateWrapper<DoctorAdvice> updateWrapper=new UpdateWrapper<>();
-            updateWrapper.eq("doctor_advice_id", aDeleteFlagVO.getDoctorAdviceId())
-                    .eq("behospital_code", aDeleteFlagVO.getBehospitalCode())
-                    .eq("hospital_id", aDeleteFlagVO.getHospitalId())
-                    .eq("is_deleted",IsDeleteEnum.N)
-                    .set("is_deleted",IsDeleteEnum.Y)
-                    .set("gmt_modified", DateUtil.now());
+        try {
+            //验证数据是否存在
+            if(StringUtil.isNotBlank(aDeleteFlagVO.getDoctorAdviceId())) {
+                return RespDTO.onError("请输入病人医嘱编码!");
+            }else if(aDeleteFlagVO.getHospitalId()==null){
+                return RespDTO.onError("请输入医院编码!");
+            }else if(StringUtil.isNotBlank(aDeleteFlagVO.getBehospitalCode())){
+                return RespDTO.onError("请输入病人住院编码!");
+            }else {
+                UpdateWrapper<DoctorAdvice> updateWrapper=new UpdateWrapper<>();
+                updateWrapper.eq("doctor_advice_id", aDeleteFlagVO.getDoctorAdviceId())
+                        .eq("behospital_code", aDeleteFlagVO.getBehospitalCode())
+                        .eq("hospital_id", aDeleteFlagVO.getHospitalId())
+                        .eq("is_deleted",IsDeleteEnum.N)
+                        .set("is_deleted",IsDeleteEnum.Y)
+                        .set("gmt_modified", DateUtil.now());
 
-            Boolean flag=update(new DoctorAdvice(),updateWrapper);
-            return RespDTO.onSuc(flag);
+                Boolean flag=update(new DoctorAdvice(),updateWrapper);
+                return RespDTO.onSuc(flag);
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
         }
     }
 }

+ 69 - 49
src/main/java/com/diagbot/facade/data/AHomeDiagnoseInfoFacade.java

@@ -1,5 +1,6 @@
 package com.diagbot.facade.data;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.RespDTO;
@@ -28,6 +29,9 @@ public class AHomeDiagnoseInfoFacade extends HomeDiagnoseInfoServiceImpl{
     @Qualifier("homeDiagnoseInfoServiceImpl")
     private HomeDiagnoseInfoServiceImpl homeDiagnoseInfoService;
 
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
     private TZDBConn tzDBConn = new TZDBConn();
 
     /**
@@ -47,66 +51,82 @@ public class AHomeDiagnoseInfoFacade extends HomeDiagnoseInfoServiceImpl{
      * @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();
+        try {
+            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);
-            execute(homeDiagnoseList);
-            return RespDTO.onSuc(homeDiagnoseDtoList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
+                homeDiagnoseList=BeanUtil.listCopyTo(list,HomeDiagnoseInfo.class);
+                homeDiagnoseDtoList=BeanUtil.listCopyTo(list,AHomeDiagnoseDTO.class);
+                execute(homeDiagnoseList);
+                return RespDTO.onSuc(homeDiagnoseDtoList);
+            }else{
+                aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(list),"","未接收到数据!");
+                return RespDTO.onError("未接收到数据!");
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(list),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
         }
     }
 
     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())){
-                    HomeDiagnoseInfo diagnoseInfo = this.getOne(new QueryWrapper<HomeDiagnoseInfo>()
-                            .eq("home_page_id", s.getHomePageId())
-                            .eq("hospital_id", s.getHospitalId())
-                            .eq("diagnose_order_no", s.getDiagnoseOrderNo()), false);
-                    if (diagnoseInfo != null) {
-                        s.setGmtModified(new Date());
-                        updateE.add(s);
-                    } else {
-                        s.setGmtCreate(new Date());
-                        addE.add(s);
+        try {
+            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())){
+                        HomeDiagnoseInfo diagnoseInfo = this.getOne(new QueryWrapper<HomeDiagnoseInfo>()
+                                .eq("home_page_id", s.getHomePageId())
+                                .eq("hospital_id", s.getHospitalId())
+                                .eq("diagnose_order_no", s.getDiagnoseOrderNo()), false);
+                        if (diagnoseInfo != null) {
+                            s.setGmtModified(new Date());
+                            updateE.add(s);
+                        } else {
+                            s.setGmtCreate(new Date());
+                            addE.add(s);
+                        }
                     }
-                }
-            });
-        }
-        if(addE.size()>0){
-            homeDiagnoseInfoService.saveBatch(addE);
-        }
-        if(updateE.size()>0){
-            homeDiagnoseInfoService.updateBatchByKey(updateE);
+                });
+            }
+            if(addE.size()>0){
+                homeDiagnoseInfoService.saveBatch(addE);
+            }
+            if(updateE.size()>0){
+                homeDiagnoseInfoService.updateBatchByKey(updateE);
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(homeDiagnoseList),"",e.getMessage());
         }
+
     }
 
     public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
-        //验证数据是否存在
-        if(StringUtil.isNotBlank(aDeleteFlagVO.getHomePageId())) {
-            return RespDTO.onError("出院诊断未输入病案首页编号!");
-        }else if(aDeleteFlagVO.getHospitalId()==null){
-            return RespDTO.onError("出院诊断未输入医院编码!");
-        }else if(StringUtil.isNotBlank(aDeleteFlagVO.getDiagnoseOrderNo())){
-            return RespDTO.onError("出院诊断未输入顺序号!");
-        }else {
-            UpdateWrapper<HomeDiagnoseInfo> updateWrapper=new UpdateWrapper<>();
-            updateWrapper.eq("home_page_id", aDeleteFlagVO.getHomePageId())
-                    .eq("hospital_id", aDeleteFlagVO.getHospitalId())
-                    .eq("diagnose_order_no", aDeleteFlagVO.getDiagnoseOrderNo())
-                    .eq("is_deleted",IsDeleteEnum.N)
-                    .set("is_deleted",IsDeleteEnum.Y)
-                    .set("gmt_modified", DateUtil.now());
+        try {
+            //验证数据是否存在
+            if(StringUtil.isNotBlank(aDeleteFlagVO.getHomePageId())) {
+                return RespDTO.onError("出院诊断未输入病案首页编号!");
+            }else if(aDeleteFlagVO.getHospitalId()==null){
+                return RespDTO.onError("出院诊断未输入医院编码!");
+            }else if(StringUtil.isNotBlank(aDeleteFlagVO.getDiagnoseOrderNo())){
+                return RespDTO.onError("出院诊断未输入顺序号!");
+            }else {
+                UpdateWrapper<HomeDiagnoseInfo> updateWrapper=new UpdateWrapper<>();
+                updateWrapper.eq("home_page_id", aDeleteFlagVO.getHomePageId())
+                        .eq("hospital_id", aDeleteFlagVO.getHospitalId())
+                        .eq("diagnose_order_no", aDeleteFlagVO.getDiagnoseOrderNo())
+                        .eq("is_deleted",IsDeleteEnum.N)
+                        .set("is_deleted",IsDeleteEnum.Y)
+                        .set("gmt_modified", DateUtil.now());
 
-            Boolean flag=update(new HomeDiagnoseInfo(),updateWrapper);
-            return RespDTO.onSuc(flag);
+                Boolean flag=update(new HomeDiagnoseInfo(),updateWrapper);
+                return RespDTO.onSuc(flag);
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
         }
     }
 }

+ 54 - 41
src/main/java/com/diagbot/facade/data/AHomeOperationInfoFacade.java

@@ -1,5 +1,6 @@
 package com.diagbot.facade.data;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.RespDTO;
@@ -28,6 +29,9 @@ public class AHomeOperationInfoFacade extends HomeOperationInfoServiceImpl{
     @Qualifier("homeOperationInfoServiceImpl")
     private HomeOperationInfoServiceImpl homeOperationInfoService;
 
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
     private TZDBConn tzDBConn = new TZDBConn();
 
     /**
@@ -63,53 +67,62 @@ public class AHomeOperationInfoFacade extends HomeOperationInfoServiceImpl{
     }
 
     public void execute(List<HomeOperationInfo> homeOperationList){
-        List<HomeOperationInfo> addE = Lists.newLinkedList();
-        List<HomeOperationInfo> updateE = Lists.newLinkedList();
-        if (homeOperationList != null && homeOperationList.size() > 0) {
-            homeOperationList.stream().forEach(s -> {
-                if(s.getHomePageId()!=null && !"".equals(s.getOperationOrderNo())) {
-                    QueryWrapper<HomeOperationInfo> queryWrapper = new QueryWrapper<>();
-                    queryWrapper.eq("home_page_id", s.getHomePageId());
-                    queryWrapper.eq("hospital_id", s.getHospitalId());
-                    queryWrapper.eq("operation_order_no", s.getOperationOrderNo());
-                    HomeOperationInfo operationInfo = this.getOne(queryWrapper, false);
-                    if (operationInfo != null) {
-                        s.setGmtModified(new Date());
-                        updateE.add(s);
-                    } else {
-                        s.setGmtCreate(new Date());
-                        addE.add(s);
+        try {
+            List<HomeOperationInfo> addE = Lists.newLinkedList();
+            List<HomeOperationInfo> updateE = Lists.newLinkedList();
+            if (homeOperationList != null && homeOperationList.size() > 0) {
+                homeOperationList.stream().forEach(s -> {
+                    if(s.getHomePageId()!=null && !"".equals(s.getOperationOrderNo())) {
+                        QueryWrapper<HomeOperationInfo> queryWrapper = new QueryWrapper<>();
+                        queryWrapper.eq("home_page_id", s.getHomePageId());
+                        queryWrapper.eq("hospital_id", s.getHospitalId());
+                        queryWrapper.eq("operation_order_no", s.getOperationOrderNo());
+                        HomeOperationInfo operationInfo = this.getOne(queryWrapper, false);
+                        if (operationInfo != null) {
+                            s.setGmtModified(new Date());
+                            updateE.add(s);
+                        } else {
+                            s.setGmtCreate(new Date());
+                            addE.add(s);
+                        }
                     }
-                }
-            });
-        }
-        if(addE.size()>0){
-            homeOperationInfoService.saveBatch(addE);
-        }
-        if(updateE.size()>0){
-            homeOperationInfoService.updateBatchByKey(updateE);
+                });
+            }
+            if(addE.size()>0){
+                homeOperationInfoService.saveBatch(addE);
+            }
+            if(updateE.size()>0){
+                homeOperationInfoService.updateBatchByKey(updateE);
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(homeOperationList),"",e.getMessage());
         }
     }
 
     public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
-        //验证数据是否存在
-        if(StringUtil.isNotBlank(aDeleteFlagVO.getHomePageId())) {
-            return RespDTO.onError("住院手术未输入病案首页编号!");
-        }else if(aDeleteFlagVO.getHospitalId()==null){
-            return RespDTO.onError("住院手术未输入医院编码!");
-        }else if(StringUtil.isNotBlank(aDeleteFlagVO.getOperationOrderNo())){
-            return RespDTO.onError("住院手术未输入顺序号!");
-        }else {
-            UpdateWrapper<HomeOperationInfo> updateWrapper=new UpdateWrapper<>();
-            updateWrapper.eq("home_page_id", aDeleteFlagVO.getHomePageId())
-                    .eq("hospital_id", aDeleteFlagVO.getHospitalId())
-                    .eq("operation_order_no", aDeleteFlagVO.getOperationOrderNo())
-                    .eq("is_deleted",IsDeleteEnum.N)
-                    .set("is_deleted",IsDeleteEnum.Y)
-                    .set("gmt_modified", DateUtil.now());
+        try {
+            //验证数据是否存在
+            if(StringUtil.isNotBlank(aDeleteFlagVO.getHomePageId())) {
+                return RespDTO.onError("住院手术未输入病案首页编号!");
+            }else if(aDeleteFlagVO.getHospitalId()==null){
+                return RespDTO.onError("住院手术未输入医院编码!");
+            }else if(StringUtil.isNotBlank(aDeleteFlagVO.getOperationOrderNo())){
+                return RespDTO.onError("住院手术未输入顺序号!");
+            }else {
+                UpdateWrapper<HomeOperationInfo> updateWrapper=new UpdateWrapper<>();
+                updateWrapper.eq("home_page_id", aDeleteFlagVO.getHomePageId())
+                        .eq("hospital_id", aDeleteFlagVO.getHospitalId())
+                        .eq("operation_order_no", aDeleteFlagVO.getOperationOrderNo())
+                        .eq("is_deleted",IsDeleteEnum.N)
+                        .set("is_deleted",IsDeleteEnum.Y)
+                        .set("gmt_modified", DateUtil.now());
 
-            Boolean flag=update(new HomeOperationInfo(),updateWrapper);
-            return RespDTO.onSuc(flag);
+                Boolean flag=update(new HomeOperationInfo(),updateWrapper);
+                return RespDTO.onSuc(flag);
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
         }
     }
 }

+ 186 - 152
src/main/java/com/diagbot/facade/data/AHomePageFacade.java

@@ -1,5 +1,6 @@
 package com.diagbot.facade.data;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.AnalyzeRunDTO;
@@ -38,6 +39,9 @@ public class AHomePageFacade extends HomePageServiceImpl{
     @Autowired
     private BehospitalInfoFacade behospitalInfoFacade;
 
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
     @Autowired
     private ReadProperties readProperties;
 
@@ -81,49 +85,55 @@ public class AHomePageFacade extends HomePageServiceImpl{
      * @return
      */
     public RespDTO<Map<String, Object>> executeHomePageIng(AHomePageIngVO aHomePageIngVO){
-        if(aHomePageIngVO.getHomePages()!=null && aHomePageIngVO.getHomePages().size()>0){
-            //验证数据有效性
-            for (AHomePageVO aHomePageVO:aHomePageIngVO.getHomePages()) {
-                if("".equals(aHomePageVO.getHomePageId())) {
-                    return RespDTO.onError("请输入病案首页编号!");
-                }else if(aHomePageVO.getHospitalId()==null){
-                    return RespDTO.onError("请输入医院编码!");
-                }else if("".equals(aHomePageVO.getBehospitalCode())){
-                    return RespDTO.onError("请输入病人住院编码!");
-                }
-                //出院诊断
-                if(aHomePageVO.getLeaveDiags()!=null && aHomePageVO.getLeaveDiags().size()>0){
-                    for (AHomeDiagnoseVO aHomeDiagnoseVO:aHomePageVO.getLeaveDiags()){
-                        if("".equals(aHomeDiagnoseVO.getHomePageId())) {
-                            return RespDTO.onError("出院诊断未输入病案首页编号!");
-                        }else if(aHomeDiagnoseVO.getHospitalId()==null){
-                            return RespDTO.onError("出院诊断未输入医院编码!");
-                        }else if("".equals(aHomeDiagnoseVO.getDiagnoseOrderNo())){
-                            return RespDTO.onError("出院诊断未输入顺序号!");
-                        }
+        try {
+            if(aHomePageIngVO.getHomePages()!=null && aHomePageIngVO.getHomePages().size()>0){
+                //验证数据有效性
+                for (AHomePageVO aHomePageVO:aHomePageIngVO.getHomePages()) {
+                    if("".equals(aHomePageVO.getHomePageId())) {
+                        return RespDTO.onError("请输入病案首页编号!");
+                    }else if(aHomePageVO.getHospitalId()==null){
+                        return RespDTO.onError("请输入医院编码!");
+                    }else if("".equals(aHomePageVO.getBehospitalCode())){
+                        return RespDTO.onError("请输入病人住院编码!");
                     }
-                };
+                    //出院诊断
+                    if(aHomePageVO.getLeaveDiags()!=null && aHomePageVO.getLeaveDiags().size()>0){
+                        for (AHomeDiagnoseVO aHomeDiagnoseVO:aHomePageVO.getLeaveDiags()){
+                            if("".equals(aHomeDiagnoseVO.getHomePageId())) {
+                                return RespDTO.onError("出院诊断未输入病案首页编号!");
+                            }else if(aHomeDiagnoseVO.getHospitalId()==null){
+                                return RespDTO.onError("出院诊断未输入医院编码!");
+                            }else if("".equals(aHomeDiagnoseVO.getDiagnoseOrderNo())){
+                                return RespDTO.onError("出院诊断未输入顺序号!");
+                            }
+                        }
+                    };
 
-                //住院手术
-                if(aHomePageVO.getOperations()!=null && aHomePageVO.getOperations().size()>0){
-                    for (AHomeOperationVO aHomeOperationVO:aHomePageVO.getOperations()){
-                        if("".equals(aHomeOperationVO.getHomePageId())) {
-                            return RespDTO.onError("住院手术未输入病案首页编号!");
-                        }else if(aHomeOperationVO.getHospitalId()==null){
-                            return RespDTO.onError("住院手术未输入医院编码!");
-                        }else if("".equals(aHomeOperationVO.getOperationOrderNo())){
-                            return RespDTO.onError("住院手术未输入顺序号!");
+                    //住院手术
+                    if(aHomePageVO.getOperations()!=null && aHomePageVO.getOperations().size()>0){
+                        for (AHomeOperationVO aHomeOperationVO:aHomePageVO.getOperations()){
+                            if("".equals(aHomeOperationVO.getHomePageId())) {
+                                return RespDTO.onError("住院手术未输入病案首页编号!");
+                            }else if(aHomeOperationVO.getHospitalId()==null){
+                                return RespDTO.onError("住院手术未输入医院编码!");
+                            }else if("".equals(aHomeOperationVO.getOperationOrderNo())){
+                                return RespDTO.onError("住院手术未输入顺序号!");
+                            }
                         }
                     }
                 }
-            }
 
-            //装载数据
-            updateHomePageIng(aHomePageIngVO);
-            //评分后返回结构体
-            return homePageIng(aHomePageIngVO);
-        }else{
-            return RespDTO.onError("未接收到数据!");
+                //装载数据
+                updateHomePageIng(aHomePageIngVO);
+                //评分后返回结构体
+                return homePageIng(aHomePageIngVO);
+            }else{
+                aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(aHomePageIngVO),"","未接收到数据!");
+                return RespDTO.onError("未接收到数据!");
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(aHomePageIngVO),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
         }
     }
 
@@ -132,19 +142,23 @@ public class AHomePageFacade extends HomePageServiceImpl{
      * @param aHomePageIngVO
      */
     private void updateHomePageIng(AHomePageIngVO aHomePageIngVO){
-        List<HomePage> homePageList=Lists.newArrayList();
-        aHomePageIngVO.getHomePages().stream().forEach(s->{
-            //初始化入参
-            HomePage homePage=new HomePage();
-            BeanUtil.copyProperties(s,homePage);
-            homePage.setBirthday(DateUtil.parseDate(s.getBirthday()));
-            homePageList.add(homePage);
+        try {
+            List<HomePage> homePageList=Lists.newArrayList();
+            aHomePageIngVO.getHomePages().stream().forEach(s->{
+                //初始化入参
+                HomePage homePage=new HomePage();
+                BeanUtil.copyProperties(s,homePage);
+                homePage.setBirthday(DateUtil.parseDate(s.getBirthday()));
+                homePageList.add(homePage);
 
-            //初始化诊断和手术,并同步到数据库
-            aHomeDiagnoseInfoFacade.executeHomeDiagnose(s.getLeaveDiags());//首页诊断
-            aHomeOperationInfoFacade.executeHomeOperation(s.getOperations());//首页手术
-        });
-        execute(homePageList);
+                //初始化诊断和手术,并同步到数据库
+                aHomeDiagnoseInfoFacade.executeHomeDiagnose(s.getLeaveDiags());//首页诊断
+                aHomeOperationInfoFacade.executeHomeOperation(s.getOperations());//首页手术
+            });
+            execute(homePageList);
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(aHomePageIngVO),"",e.getMessage());
+        }
     }
 
     /**
@@ -153,46 +167,51 @@ public class AHomePageFacade extends HomePageServiceImpl{
      * @return
      */
     private RespDTO<Map<String, Object>> homePageIng(AHomePageIngVO aHomePageIngVO){
-        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);
-            return RespDTO.onSuc(map);
-        }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);
-            return RespDTO.onSuc(map);
-        }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());
-            }
-            return RespDTO.onSuc(map);
-        }else{
-            //页面模式+接口引擎模式
-            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){
+        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);
+                return RespDTO.onSuc(map);
+            }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);
-                map.put("analyze",analyzeRunDTO.getMsgDTOList());
+                return RespDTO.onSuc(map);
+            }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());
+                }
+                return RespDTO.onSuc(map);
+            }else{
+                //页面模式+接口引擎模式
+                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());
+                }
+                return RespDTO.onSuc(map);
             }
-            return RespDTO.onSuc(map);
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(aHomePageIngVO),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
         }
     }
 
@@ -203,34 +222,40 @@ public class AHomePageFacade extends HomePageServiceImpl{
      * @return
      */
     public RespDTO<List<AHomePageDTO>> executeHomePage(List<AHomePageVO> list) {
-        if(list!=null && list.size()>0){
-            //循环验证数据有效性
-            for (AHomePageVO aHomePageVO:list) {
-                if("".equals(aHomePageVO.getHomePageId())) {
-                    return RespDTO.onError("请输入病案首页编号!");
-                }else if(aHomePageVO.getHospitalId()==null){
-                    return RespDTO.onError("请输入医院编码!");
-                }else if("".equals(aHomePageVO.getBehospitalCode())){
-                    return RespDTO.onError("请输入病人住院编码!");
+        try {
+            if(list!=null && list.size()>0){
+                //循环验证数据有效性
+                for (AHomePageVO aHomePageVO:list) {
+                    if("".equals(aHomePageVO.getHomePageId())) {
+                        return RespDTO.onError("请输入病案首页编号!");
+                    }else if(aHomePageVO.getHospitalId()==null){
+                        return RespDTO.onError("请输入医院编码!");
+                    }else if("".equals(aHomePageVO.getBehospitalCode())){
+                        return RespDTO.onError("请输入病人住院编码!");
+                    }
                 }
+                //装载数据
+                List<HomePage> homePageList=Lists.newArrayList();
+                list.stream().forEach(s->{
+                    //初始化入参
+                    HomePage homePage=new HomePage();
+                    BeanUtil.copyProperties(s,homePage);
+                    homePage.setBirthday(DateUtil.parseDate(s.getBirthday()));
+                    homePage.setBehospitalDate(DateUtil.parseDateTime(s.getBehospitalDate()));
+                    homePage.setLeaveHospitalDate(DateUtil.parseDateTime(s.getLeaveHospitalDate()));
+                    homePage.setQcDate(DateUtil.parseDateTime(s.getQcDate()));
+                    homePageList.add(homePage);
+                });
+                execute(homePageList);
+                List<AHomePageDTO> homePageDtoList=BeanUtil.listCopyTo(list,AHomePageDTO.class);
+                return RespDTO.onSuc(homePageDtoList);
+            }else{
+                aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(list),"","未接收到数据!");
+                return RespDTO.onError("未接收到数据!");
             }
-            //装载数据
-            List<HomePage> homePageList=Lists.newArrayList();
-            list.stream().forEach(s->{
-                //初始化入参
-                HomePage homePage=new HomePage();
-                BeanUtil.copyProperties(s,homePage);
-                homePage.setBirthday(DateUtil.parseDate(s.getBirthday()));
-                homePage.setBehospitalDate(DateUtil.parseDateTime(s.getBehospitalDate()));
-                homePage.setLeaveHospitalDate(DateUtil.parseDateTime(s.getLeaveHospitalDate()));
-                homePage.setQcDate(DateUtil.parseDateTime(s.getQcDate()));
-                homePageList.add(homePage);
-            });
-            execute(homePageList);
-            List<AHomePageDTO> homePageDtoList=BeanUtil.listCopyTo(list,AHomePageDTO.class);
-            return RespDTO.onSuc(homePageDtoList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(list),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
         }
     }
 
@@ -239,49 +264,58 @@ public class AHomePageFacade extends HomePageServiceImpl{
      * @param homePageList
      */
     public void execute(List<HomePage> homePageList){
-        List<HomePage> addE = Lists.newLinkedList();
-        List<HomePage> updateE = Lists.newLinkedList();
-        if (homePageList != null && homePageList.size() > 0) {
-            homePageList.stream().forEach(s -> {
-                HomePage homePage = this.getOne(new QueryWrapper<HomePage>()
-                        .eq("home_page_id", s.getHomePageId())
-                        .eq("hospital_id", s.getHospitalId())
-                        .eq("behospital_code", s.getBehospitalCode()), false);
-                if (homePage != null) {
-                    s.setGmtModified(new Date());
-                    updateE.add(s);
-                } else {
-                    s.setGmtCreate(new Date());
-                    addE.add(s);
-                }
-            });
-        }
-        if(addE.size()>0){
-            homePageService.saveBatch(addE);
-        }
-        if(updateE.size()>0){
-            homePageService.updateBatchByKey(updateE);
+        try {
+            List<HomePage> addE = Lists.newLinkedList();
+            List<HomePage> updateE = Lists.newLinkedList();
+            if (homePageList != null && homePageList.size() > 0) {
+                homePageList.stream().forEach(s -> {
+                    HomePage homePage = this.getOne(new QueryWrapper<HomePage>()
+                            .eq("home_page_id", s.getHomePageId())
+                            .eq("hospital_id", s.getHospitalId())
+                            .eq("behospital_code", s.getBehospitalCode()), false);
+                    if (homePage != null) {
+                        s.setGmtModified(new Date());
+                        updateE.add(s);
+                    } else {
+                        s.setGmtCreate(new Date());
+                        addE.add(s);
+                    }
+                });
+            }
+            if(addE.size()>0){
+                homePageService.saveBatch(addE);
+            }
+            if(updateE.size()>0){
+                homePageService.updateBatchByKey(updateE);
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(homePageList),"",e.getMessage());
         }
     }
 
     public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
-        //验证数据是否存在
-        if(StringUtil.isNotBlank(aDeleteFlagVO.getHomePageId())) {
-            return RespDTO.onError("请输入病案首页编号!");
-        }else if(aDeleteFlagVO.getHospitalId()==null){
-            return RespDTO.onError("请输入医院编码!");
-        }else if(StringUtil.isNotBlank(aDeleteFlagVO.getBehospitalCode())){
-            return RespDTO.onError("请输入病人住院编码!");
-        }else {
-            UpdateWrapper<HomePage> updateWrapper=new UpdateWrapper<>();
-            updateWrapper.eq("home_page_id", aDeleteFlagVO.getHomePageId())
-                    .eq("hospital_id", aDeleteFlagVO.getHospitalId())
-                    .eq("operation_order_no", aDeleteFlagVO.getOperationOrderNo())
-                    .eq("is_deleted",IsDeleteEnum.N)
-                    .set("is_deleted",IsDeleteEnum.Y)
-                    .set("gmt_modified", DateUtil.now());
-            Boolean flag=update(new HomePage(),updateWrapper);
-            return RespDTO.onSuc(flag);
+        try {
+            //验证数据是否存在
+            if(StringUtil.isNotBlank(aDeleteFlagVO.getHomePageId())) {
+                return RespDTO.onError("请输入病案首页编号!");
+            }else if(aDeleteFlagVO.getHospitalId()==null){
+                return RespDTO.onError("请输入医院编码!");
+            }else if(StringUtil.isNotBlank(aDeleteFlagVO.getBehospitalCode())){
+                return RespDTO.onError("请输入病人住院编码!");
+            }else {
+                UpdateWrapper<HomePage> updateWrapper=new UpdateWrapper<>();
+                updateWrapper.eq("home_page_id", aDeleteFlagVO.getHomePageId())
+                        .eq("hospital_id", aDeleteFlagVO.getHospitalId())
+                        .eq("operation_order_no", aDeleteFlagVO.getOperationOrderNo())
+                        .eq("is_deleted",IsDeleteEnum.N)
+                        .set("is_deleted",IsDeleteEnum.Y)
+                        .set("gmt_modified", DateUtil.now());
+                Boolean flag=update(new HomePage(),updateWrapper);
+                return RespDTO.onSuc(flag);
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
         }
     }
 }

+ 84 - 65
src/main/java/com/diagbot/facade/data/AMedCrisisFacade.java

@@ -1,5 +1,6 @@
 package com.diagbot.facade.data;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.RespDTO;
@@ -27,84 +28,102 @@ public class AMedCrisisFacade extends MedCrisisInfoServiceImpl{
     @Qualifier("medCrisisInfoServiceImpl")
     private MedCrisisInfoServiceImpl medCrisisInfoService;
 
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
     public RespDTO<List<AMedCrisisDTO>> executeMedCrisis(List<AMedCrisisVO> list) {
-        if(list!=null && list.size()>0){
-            //循环验证数据有效性
-            for (AMedCrisisVO aMedCrisisVO:list) {
-                if("".equals(aMedCrisisVO.getRecId())){
-                    return RespDTO.onError("请输入文书编码!");
-                }else if("".equals(aMedCrisisVO.getBehospitalCode())) {
-                    return RespDTO.onError("请输入病人住院编码!");
-                }else if(aMedCrisisVO.getHospitalId()==null){
-                    return RespDTO.onError("请输入医院编码!");
-                }else if("".equals(aMedCrisisVO.getRecType())){
-                    return RespDTO.onError("请输入危急值类型!");
+        try {
+            if(list!=null && list.size()>0){
+                //循环验证数据有效性
+                for (AMedCrisisVO aMedCrisisVO:list) {
+                    if("".equals(aMedCrisisVO.getRecId())){
+                        return RespDTO.onError("请输入文书编码!");
+                    }else if("".equals(aMedCrisisVO.getBehospitalCode())) {
+                        return RespDTO.onError("请输入病人住院编码!");
+                    }else if(aMedCrisisVO.getHospitalId()==null){
+                        return RespDTO.onError("请输入医院编码!");
+                    }else if("".equals(aMedCrisisVO.getRecType())){
+                        return RespDTO.onError("请输入危急值类型!");
+                    }
                 }
-            }
 
-            List<MedCrisisInfo> medCrisisList=Lists.newArrayList();
-            list.stream().forEach(s->{
-                MedCrisisInfo medCrisisInfo=new MedCrisisInfo();
-                BeanUtil.copyProperties(s,medCrisisInfo);
-                medCrisisInfo.setRepDate(DateUtil.parseDateTime(s.getRepDate()));
-                medCrisisInfo.setSendDate(DateUtil.parseDateTime(s.getSendDate()));
-                medCrisisList.add(medCrisisInfo);
-            });
-            execute(medCrisisList);
+                List<MedCrisisInfo> medCrisisList=Lists.newArrayList();
+                list.stream().forEach(s->{
+                    MedCrisisInfo medCrisisInfo=new MedCrisisInfo();
+                    BeanUtil.copyProperties(s,medCrisisInfo);
+                    medCrisisInfo.setRepDate(DateUtil.parseDateTime(s.getRepDate()));
+                    medCrisisInfo.setSendDate(DateUtil.parseDateTime(s.getSendDate()));
+                    medCrisisList.add(medCrisisInfo);
+                });
+                execute(medCrisisList);
 
-            List<AMedCrisisDTO> medCrisisDtoList=BeanUtil.listCopyTo(list,AMedCrisisDTO.class);
-            return RespDTO.onSuc(medCrisisDtoList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
+                List<AMedCrisisDTO> medCrisisDtoList=BeanUtil.listCopyTo(list,AMedCrisisDTO.class);
+                return RespDTO.onSuc(medCrisisDtoList);
+            }else{
+                aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(list),"","未接收到数据!");
+                return RespDTO.onError("未接收到数据!");
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(list),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
         }
     }
 
     public void execute(List<MedCrisisInfo> medCrisisList){
-        List<MedCrisisInfo> addE = Lists.newLinkedList();
-        List<MedCrisisInfo> updateE = Lists.newLinkedList();
-        if (medCrisisList != null && medCrisisList.size() > 0) {
-            medCrisisList.stream().forEach(s -> {
-                MedCrisisInfo medCrisisInfo = this.getOne(new QueryWrapper<MedCrisisInfo>()
-                .eq("rec_id", s.getRecId())
-                .eq("hospital_id", s.getHospitalId())
-                .eq("behospital_code", s.getBehospitalCode())
-                .eq("rec_type", s.getRecType()), false);
-                if (medCrisisInfo != null) {
-                    s.setGmtModified(new Date());
-                    updateE.add(s);
-                } else {
-                    s.setGmtCreate(new Date());
-                    addE.add(s);
-                }
-            });
-        }
-        if(addE.size()>0){
-            medCrisisInfoService.saveBatch(addE);
-        }
-        if(updateE.size()>0){
-            medCrisisInfoService.updateBatchByKey(updateE);
+        try {
+            List<MedCrisisInfo> addE = Lists.newLinkedList();
+            List<MedCrisisInfo> updateE = Lists.newLinkedList();
+            if (medCrisisList != null && medCrisisList.size() > 0) {
+                medCrisisList.stream().forEach(s -> {
+                    MedCrisisInfo medCrisisInfo = this.getOne(new QueryWrapper<MedCrisisInfo>()
+                            .eq("rec_id", s.getRecId())
+                            .eq("hospital_id", s.getHospitalId())
+                            .eq("behospital_code", s.getBehospitalCode())
+                            .eq("rec_type", s.getRecType()), false);
+                    if (medCrisisInfo != null) {
+                        s.setGmtModified(new Date());
+                        updateE.add(s);
+                    } else {
+                        s.setGmtCreate(new Date());
+                        addE.add(s);
+                    }
+                });
+            }
+            if(addE.size()>0){
+                medCrisisInfoService.saveBatch(addE);
+            }
+            if(updateE.size()>0){
+                medCrisisInfoService.updateBatchByKey(updateE);
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(medCrisisList),"",e.getMessage());
         }
     }
 
     public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
-        //验证数据是否存在
-        if(StringUtil.isNotBlank(aDeleteFlagVO.getRecId())){
-            return RespDTO.onError("请输入文书编码!");
-        }else if(StringUtil.isNotBlank(aDeleteFlagVO.getBehospitalCode())) {
-            return RespDTO.onError("请输入病人住院编码!");
-        }else if(aDeleteFlagVO.getHospitalId()==null){
-            return RespDTO.onError("请输入医院编码!");
-        }else {
-            UpdateWrapper<MedCrisisInfo> updateWrapper=new UpdateWrapper<>();
-            updateWrapper.eq("home_page_id", aDeleteFlagVO.getHomePageId())
-                    .eq("hospital_id", aDeleteFlagVO.getHospitalId())
-                    .eq("operation_order_no", aDeleteFlagVO.getOperationOrderNo())
-                    .eq("is_deleted",IsDeleteEnum.N)
-                    .set("is_deleted",IsDeleteEnum.Y)
-                    .set("gmt_modified", DateUtil.now());
+        try {
+            //验证数据是否存在
+            if(StringUtil.isNotBlank(aDeleteFlagVO.getRecId())){
+                return RespDTO.onError("请输入文书编码!");
+            }else if(StringUtil.isNotBlank(aDeleteFlagVO.getBehospitalCode())) {
+                return RespDTO.onError("请输入病人住院编码!");
+            }else if(aDeleteFlagVO.getHospitalId()==null){
+                return RespDTO.onError("请输入医院编码!");
+            }else {
+                UpdateWrapper<MedCrisisInfo> updateWrapper=new UpdateWrapper<>();
+                updateWrapper.eq("home_page_id", aDeleteFlagVO.getHomePageId())
+                        .eq("hospital_id", aDeleteFlagVO.getHospitalId())
+                        .eq("operation_order_no", aDeleteFlagVO.getOperationOrderNo())
+                        .eq("is_deleted",IsDeleteEnum.N)
+                        .set("is_deleted",IsDeleteEnum.Y)
+                        .set("gmt_modified", DateUtil.now());
 
-            Boolean flag=update(new MedCrisisInfo(),updateWrapper);
-            return RespDTO.onSuc(flag);
+                Boolean flag=update(new MedCrisisInfo(),updateWrapper);
+                return RespDTO.onSuc(flag);
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
         }
     }
 }

+ 64 - 44
src/main/java/com/diagbot/facade/data/AMedicalRecordContentFacade.java

@@ -1,5 +1,6 @@
 package com.diagbot.facade.data;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.RespDTO;
@@ -28,6 +29,9 @@ public class AMedicalRecordContentFacade extends MedicalRecordContentServiceImpl
     @Autowired
     private MedicalRecordContentServiceImpl medicalRecordContentService;
 
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
     private TZDBConn tzDBConn = new TZDBConn();
 
     /**
@@ -46,59 +50,75 @@ public class AMedicalRecordContentFacade extends MedicalRecordContentServiceImpl
      * @return
      */
     public RespDTO<List<AMedicalRecordContentDTO>> executeMrRecordContent(List<AMedicalRecordContentVO> list) {
-        if(list!=null && list.size()>0) {
-            List<MedicalRecordContent> mrContentList=BeanUtil.listCopyTo(list,MedicalRecordContent.class);
-            List<AMedicalRecordContentDTO> mrContentDtoList=BeanUtil.listCopyTo(list,AMedicalRecordContentDTO.class);
-            execute(mrContentList);
-            return RespDTO.onSuc(mrContentDtoList);
-        }else{
-            return RespDTO.onError("未接收到数据!");
+        try {
+            if(list!=null && list.size()>0) {
+                List<MedicalRecordContent> mrContentList=BeanUtil.listCopyTo(list,MedicalRecordContent.class);
+                List<AMedicalRecordContentDTO> mrContentDtoList=BeanUtil.listCopyTo(list,AMedicalRecordContentDTO.class);
+                execute(mrContentList);
+                return RespDTO.onSuc(mrContentDtoList);
+            }else{
+                aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(list),"","未接收到数据!");
+                return RespDTO.onError("未接收到数据!");
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(list),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
         }
+
     }
 
     public void execute(List<MedicalRecordContent> mrContentList){
-        List<MedicalRecordContent> addE = Lists.newLinkedList();
-        List<MedicalRecordContent> updateE = Lists.newLinkedList();
-        if (mrContentList != null && mrContentList.size() > 0) {
-            mrContentList.stream().forEach(s -> {
-                QueryWrapper<MedicalRecordContent> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("rec_id", s.getRecId());
-                queryWrapper.eq("hospital_id", s.getHospitalId());
-                MedicalRecordContent mrContent = this.getOne(queryWrapper, false);
-                if (mrContent != null) {
-                    s.setGmtModified(new Date());
-                    updateE.add(s);
-                } else {
-                    s.setGmtCreate(new Date());
-                    addE.add(s);
-                }
-            });
-        }
-        if(addE.size()>0){
-            medicalRecordContentService.saveBatch(addE);
-        }
-        if(updateE.size()>0){
-            medicalRecordContentService.updateBatchByKey(updateE);
+        try {
+            List<MedicalRecordContent> addE = Lists.newLinkedList();
+            List<MedicalRecordContent> updateE = Lists.newLinkedList();
+            if (mrContentList != null && mrContentList.size() > 0) {
+                mrContentList.stream().forEach(s -> {
+                    QueryWrapper<MedicalRecordContent> queryWrapper = new QueryWrapper<>();
+                    queryWrapper.eq("rec_id", s.getRecId());
+                    queryWrapper.eq("hospital_id", s.getHospitalId());
+                    MedicalRecordContent mrContent = this.getOne(queryWrapper, false);
+                    if (mrContent != null) {
+                        s.setGmtModified(new Date());
+                        updateE.add(s);
+                    } else {
+                        s.setGmtCreate(new Date());
+                        addE.add(s);
+                    }
+                });
+            }
+            if(addE.size()>0){
+                medicalRecordContentService.saveBatch(addE);
+            }
+            if(updateE.size()>0){
+                medicalRecordContentService.updateBatchByKey(updateE);
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(mrContentList),"",e.getMessage());
         }
     }
 
     public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
-        //验证数据是否存在
-        if (StringUtil.isNotBlank(aDeleteFlagVO.getRecId())) {
-            return RespDTO.onError("请输入文书序号!");
-        } else if (aDeleteFlagVO.getHospitalId() == null) {
-            return RespDTO.onError("请输入医院编码!");
-        }else {
-            UpdateWrapper<MedicalRecordContent> updateWrapper=new UpdateWrapper<>();
-            updateWrapper.eq("rec_id", aDeleteFlagVO.getRecId())
-                    .eq("hospital_id", aDeleteFlagVO.getHospitalId())
-                    .eq("behospital_code", aDeleteFlagVO.getBehospitalCode())
-                    .eq("is_deleted",IsDeleteEnum.N)
-                    .set("is_deleted",IsDeleteEnum.Y)
-                    .set("gmt_modified", DateUtil.now());
+        try {
+            //验证数据是否存在
+            if (StringUtil.isNotBlank(aDeleteFlagVO.getRecId())) {
+                return RespDTO.onError("请输入文书序号!");
+            } else if (aDeleteFlagVO.getHospitalId() == null) {
+                return RespDTO.onError("请输入医院编码!");
+            }else {
+                UpdateWrapper<MedicalRecordContent> updateWrapper=new UpdateWrapper<>();
+                updateWrapper.eq("rec_id", aDeleteFlagVO.getRecId())
+                        .eq("hospital_id", aDeleteFlagVO.getHospitalId())
+                        .eq("behospital_code", aDeleteFlagVO.getBehospitalCode())
+                        .eq("is_deleted",IsDeleteEnum.N)
+                        .set("is_deleted",IsDeleteEnum.Y)
+                        .set("gmt_modified", DateUtil.now());
 
-            Boolean flag=update(new MedicalRecordContent(),updateWrapper);
-            return RespDTO.onSuc(flag);
+                Boolean flag=update(new MedicalRecordContent(),updateWrapper);
+                return RespDTO.onSuc(flag);
+            }
+        }catch (Exception e){
+            aMedAbnormalInfoFacade.saveAbnormalInfo(JSON.toJSONString(aDeleteFlagVO),"",e.getMessage());
+            return RespDTO.onError(e.getMessage());
         }
     }
 }

+ 3 - 0
src/main/java/com/diagbot/facade/data/AMedicalRecordFacade.java

@@ -54,6 +54,9 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
     @Autowired
     private ReadProperties readProperties;
 
+    @Autowired
+    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
+
     private TZDBConn tzDBConn = new TZDBConn();
 
     /**