فهرست منبع

版本升级,增加归档接口

liuqq 4 سال پیش
والد
کامیت
43943586dc

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

@@ -229,7 +229,7 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
     public RespDTO placeFileFlag(APlaceFileVO aPlaceFileVO){
         try {
             //验证数据是否存在
-            if(StringUtil.isEmpty(aPlaceFileVO.getBehospitalCode())){
+            if(StringUtil.isBlank(aPlaceFileVO.getBehospitalCode())){
                 return RespDTO.onError("请输入病人住院编码!");
             }else if(aPlaceFileVO.getHospitalId()==null){
                 return RespDTO.onError("请输入医院编码!");
@@ -239,7 +239,7 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
                         .eq("hospital_id", aPlaceFileVO.getHospitalId())
                         .eq("is_deleted",IsDeleteEnum.N)
                         .set("is_placefile","1")
-                        .set("placefile_date",aPlaceFileVO.getPlaceFileDate().isEmpty()?null:DateUtil.parseDateTime(aPlaceFileVO.getPlaceFileDate()))
+                        .set("placefile_date",aPlaceFileVO.getPlaceFileDate().isEmpty()?DateUtil.formatDateTime(DateUtil.now()):DateUtil.parseDateTime(aPlaceFileVO.getPlaceFileDate()))
                         .set("gmt_modified", DateUtil.now());
 
                 Boolean flag=update(new BehospitalInfo(),updateWrapper);

+ 10 - 11
src/main/java/com/diagbot/web/DataController.java

@@ -157,31 +157,31 @@ public class DataController {
     public RespDTO deleteFlag(@RequestBody ADeleteFlagVO aDeleteFlagVO){
         if("brzyxx".equals(aDeleteFlagVO.getModeType())){
             //住院登记
-            aBehospitalInfoFacade.deleteFlag(aDeleteFlagVO);
+            return aBehospitalInfoFacade.deleteFlag(aDeleteFlagVO);
         }else if("bryz".equals(aDeleteFlagVO.getModeType())){
             //病人医嘱
-            aDoctorAdviceFacade.deleteFlag(aDeleteFlagVO);
+            return aDoctorAdviceFacade.deleteFlag(aDeleteFlagVO);
         }else if("basyxx".equals(aDeleteFlagVO.getModeType())){
             //病案首页
-            aHomePageFacade.deleteFlag(aDeleteFlagVO);
+            return aHomePageFacade.deleteFlag(aDeleteFlagVO);
         }else if("basyzd".equals(aDeleteFlagVO.getModeType())){
             //病案诊断
-            aHomeDiagnoseInfoFacade.deleteFlag(aDeleteFlagVO);
+            return aHomeDiagnoseInfoFacade.deleteFlag(aDeleteFlagVO);
         }else if("basyss".equals(aDeleteFlagVO.getModeType())){
             //病案手术
-            aHomeOperationInfoFacade.deleteFlag(aDeleteFlagVO);
+            return aHomeOperationInfoFacade.deleteFlag(aDeleteFlagVO);
         }else if("wsxx".equals(aDeleteFlagVO.getModeType())){
             //文书信息
-            aMedicalRecordFacade.deleteFlag(aDeleteFlagVO);
+            return aMedicalRecordFacade.deleteFlag(aDeleteFlagVO);
         }else if("wsnr".equals(aDeleteFlagVO.getModeType())){
             //文书内容
-            aMedicalRecordContentFacade.deleteFlag(aDeleteFlagVO);
+            return aMedicalRecordContentFacade.deleteFlag(aDeleteFlagVO);
         }else if("hyjg".equals(aDeleteFlagVO.getModeType())){
             //文书内容
-            aMedLisResultFacade.deleteFlag(aDeleteFlagVO);
+            return aMedLisResultFacade.deleteFlag(aDeleteFlagVO);
         }else if("jcjg".equals(aDeleteFlagVO.getModeType())){
             //文书内容
-            aMedPacsResultFacade.deleteFlag(aDeleteFlagVO);
+            return aMedPacsResultFacade.deleteFlag(aDeleteFlagVO);
         }
         return RespDTO.onSuc(true);
     }
@@ -190,8 +190,7 @@ public class DataController {
     @PostMapping("/placeFile")
     @SysLogger("placeFile")
     public RespDTO placeFileFlag(@RequestBody APlaceFileVO aPlaceFileVO){
-        aBehospitalInfoFacade.placeFileFlag(aPlaceFileVO);
-        return RespDTO.onSuc(true);
+        return aBehospitalInfoFacade.placeFileFlag(aPlaceFileVO);
     }
 
     @ApiOperation(value = "检查")