Merge remote-tracking branch 'origin/demo/edit' into demo/edit

src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -161,7 +161,6 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/qc/data/sendPatientInfo").permitAll()
                 .antMatchers("/qc/data/sendDoctorAdvice").permitAll()
                 .antMatchers("/qc/data/sendHomePageIng").permitAll()
-                .antMatchers("/qc/data/executeHomePageIng").permitAll()
                 .antMatchers("/qc/data/sendHomePage").permitAll()
                 .antMatchers("/qc/data/sendHomeDiagnose").permitAll()
                 .antMatchers("/qc/data/sendHomeOperation").permitAll()

src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -235,7 +235,6 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/qc/data/sendPatientInfo", request)
                 || matchers("/qc/data/sendDoctorAdvice", request)
                 || matchers("/qc/data/sendHomePageIng", request)
-                || matchers("/qc/data/executeHomePageIng", request)
                 || matchers("/qc/data/sendHomePage", request)
                 || matchers("/qc/data/sendHomeDiagnose", request)
                 || matchers("/qc/data/sendHomeOperation", request)

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

@@ -71,65 +71,13 @@ public class AHomePageFacade extends HomePageServiceImpl{
         execute(homePageList);
     }
 
-    /**
-     * 运行质控-验证数据有效性
-     * @param aHomePageIngVO
-     * @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("出院诊断未输入顺序号!");
-                        }
-                    }
-                };
-
-                //住院手术
-                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("未接收到数据!");
-        }
-    }
-
     /**
      * 病案首页编辑功能
      *
      * @param aHomePageIngVO
      * @return
      */
-    public RespDTO<Map<String, Object>> executeHomePageEdit(AHomePageIngVO aHomePageIngVO) {
+    public RespDTO<Map<String, Object>> executeHomePageIng(AHomePageIngVO aHomePageIngVO) {
         if (aHomePageIngVO.getHomePages() != null && aHomePageIngVO.getHomePages().size() > 0) {
             //验证数据有效性
             for (AHomePageVO aHomePageVO : aHomePageIngVO.getHomePages()) {
@@ -172,7 +120,7 @@ public class AHomePageFacade extends HomePageServiceImpl{
             }
 
             //装载数据
-            updateHomePageEdit(aHomePageIngVO);
+            updateHomePageIng(aHomePageIngVO);
             //评分后返回结构体
             return homePageIng(aHomePageIngVO);
         } else {
@@ -180,37 +128,12 @@ public class AHomePageFacade extends HomePageServiceImpl{
         }
     }
 
-    /**
-     * 更新数据到数据库
-     * @param aHomePageIngVO
-     */
-    private void updateHomePageIng(AHomePageIngVO aHomePageIngVO){
-        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);
-        }catch (Exception e){
-            log.error(e.getMessage(),e);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页","", JSON.toJSONString(aHomePageIngVO),"",e.getMessage());
-        }
-    }
-
     /**
      * 编辑功能更新数据到数据库
      *
      * @param aHomePageIngVO
      */
-    private void updateHomePageEdit(AHomePageIngVO aHomePageIngVO) {
+    private void updateHomePageIng(AHomePageIngVO aHomePageIngVO) {
         try {
             List<HomePage> homePageList = Lists.newArrayList();
             aHomePageIngVO.getHomePages().stream().forEach(s -> {

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

@@ -111,13 +111,6 @@ public class DataController {
     @PostMapping("/sendHomePageIng")
     @SysLogger("sendHomePageIng")
     public RespDTO<Map<String, Object>> sendHomePageIng(@Valid @RequestBody AHomePageIngVO aHomePageIngVO){
-        return aHomePageFacade.executeHomePageEdit(aHomePageIngVO);
-    }
-
-    @ApiOperation(value = "运行质控-获取病案首页")
-    @PostMapping("/executeHomePageIng")
-    @SysLogger("executeHomePageIng")
-    public RespDTO<Map<String, Object>> executeHomePageIng(@Valid @RequestBody AHomePageIngVO aHomePageIngVO){
         return aHomePageFacade.executeHomePageIng(aHomePageIngVO);
     }
 

src/main/resources/jdbc.properties

@@ -28,7 +28,7 @@ jdbc.password1=Lat0ne@tesT
 remote.address.ver=http://192.18.101.207:2030/index.html
 remote.address.hor=http://192.18.101.207:2030/indexHorizontal.html
 
-process.qc.url=http://192.168.100.157:1489/index.html
+process.qc.url=http://173.18.12.194:1489/index.html
 
 #his\u65b9\u60a3\u8005\u63a5\u53e3\u5730\u5740
 his.patient.url=