Bläddra i källkod

1、调整结构化model对应逻辑
2、修改病案首页回参逻辑

liuqq 4 år sedan
förälder
incheckning
4bd99dbfa0

+ 13 - 12
src/main/java/com/diagbot/facade/data/ABehospitalInfoFacade.java

@@ -70,6 +70,19 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
     public RespDTO<List<ABehospitalInfoDTO>> executeBehospital(List<ABehospitalInfoVO> list) {
         try {
             if(list!=null && list.size()>0) {
+                //循环验证数据有效性
+                for (ABehospitalInfoVO behospitalInfo:list) {
+                    if("".equals(behospitalInfo.getBehospitalCode())) {
+                        return RespDTO.onError("请输入病人住院编码!");
+                    }else if(behospitalInfo.getHospitalId()==null){
+                        return RespDTO.onError("请输入医院编码!");
+                    }else if("".equals(behospitalInfo.getBehDeptId())){
+                        return RespDTO.onError("请输入住院科室编码!");
+                    }else if("".equals(behospitalInfo.getBehDeptName())){
+                        return RespDTO.onError("请输入住院科室名称!");
+                    }
+                }
+
                 List<BehospitalInfo> behospitalInfoList = Lists.newArrayList();
                 list.stream().forEach(s->{
                     BehospitalInfo behospitalInfo=new BehospitalInfo();
@@ -90,18 +103,6 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
 
                 });
 
-                //循环验证数据有效性
-                for (BehospitalInfo behospitalInfo:behospitalInfoList) {
-                    if("".equals(behospitalInfo.getBehospitalCode())) {
-                        return RespDTO.onError("请输入病人住院编码!");
-                    }else if(behospitalInfo.getHospitalId()==null){
-                        return RespDTO.onError("请输入医院编码!");
-                    }else if("".equals(behospitalInfo.getBehDeptId())){
-                        return RespDTO.onError("请输入住院科室编码!");
-                    }else if("".equals(behospitalInfo.getBehDeptName())){
-                        return RespDTO.onError("请输入住院科室名称!");
-                    }
-                }
                 execute(behospitalInfoList);
                 if(logSwitch){
                     behospitalInfoList.forEach(s->{

+ 9 - 1
src/main/java/com/diagbot/facade/data/AHomePageFacade.java

@@ -49,6 +49,9 @@ public class AHomePageFacade extends HomePageServiceImpl{
     @Value("${log_switch.enable}")
     private boolean logSwitch;
 
+    @Value("${xml_analyse.enable}")
+    private boolean xmlAnalyse;
+
     private TZDBConn tzDBConn = new TZDBConn();
 
     /**
@@ -116,8 +119,13 @@ public class AHomePageFacade extends HomePageServiceImpl{
 
             //装载数据
             updateHomePageIng(aHomePageIngVO);
+
+            if(xmlAnalyse){
+                //评分后返回结构体
+                return homePageIng(aHomePageIngVO);
+            }
             //评分后返回结构体
-            return homePageIng(aHomePageIngVO);
+            return RespDTO.onSuc("操作成功!");
         }else{
             return RespDTO.onError("未接收到数据!");
         }