增加日志，调整删除接口

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

@@ -178,7 +178,7 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
 
     public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
         //验证数据是否存在
-        if(StringUtil.isNotBlank(aDeleteFlagVO.getBehospitalCode())){
+        if(StringUtil.isBlank(aDeleteFlagVO.getBehospitalCode())){
             return RespDTO.onError("请输入病人住院编码!");
         }else if(aDeleteFlagVO.getHospitalId()==null){
             return RespDTO.onError("请输入医院编码!");

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

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.ADoctorAdviceDTO;
-import com.diagbot.entity.BehospitalInfo;
 import com.diagbot.entity.DoctorAdvice;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.DoctorAdviceServiceImpl;
@@ -113,11 +112,11 @@ public class ADoctorAdviceFacade extends DoctorAdviceServiceImpl{
 
     public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
         //验证数据是否存在
-        if(StringUtil.isNotBlank(aDeleteFlagVO.getDoctorAdviceId())) {
+        if(StringUtil.isBlank(aDeleteFlagVO.getDoctorAdviceId())) {
             return RespDTO.onError("请输入病人医嘱编码!");
         }else if(aDeleteFlagVO.getHospitalId()==null){
             return RespDTO.onError("请输入医院编码!");
-        }else if(StringUtil.isNotBlank(aDeleteFlagVO.getBehospitalCode())){
+        }else if(StringUtil.isBlank(aDeleteFlagVO.getBehospitalCode())){
             return RespDTO.onError("请输入病人住院编码!");
         }else {
             UpdateWrapper<DoctorAdvice> updateWrapper=new UpdateWrapper<>();

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

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.AHomeDiagnoseDTO;
-import com.diagbot.entity.DoctorAdvice;
 import com.diagbot.entity.HomeDiagnoseInfo;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.HomeDiagnoseInfoServiceImpl;
@@ -91,11 +90,11 @@ public class AHomeDiagnoseInfoFacade extends HomeDiagnoseInfoServiceImpl{
 
     public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
         //验证数据是否存在
-        if(StringUtil.isNotBlank(aDeleteFlagVO.getHomePageId())) {
+        if(StringUtil.isBlank(aDeleteFlagVO.getHomePageId())) {
             return RespDTO.onError("出院诊断未输入病案首页编号!");
         }else if(aDeleteFlagVO.getHospitalId()==null){
             return RespDTO.onError("出院诊断未输入医院编码!");
-        }else if(StringUtil.isNotBlank(aDeleteFlagVO.getDiagnoseOrderNo())){
+        }else if(StringUtil.isBlank(aDeleteFlagVO.getDiagnoseOrderNo())){
             return RespDTO.onError("出院诊断未输入顺序号!");
         }else {
             UpdateWrapper<HomeDiagnoseInfo> updateWrapper=new UpdateWrapper<>();

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

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.AHomeOperationDTO;
-import com.diagbot.entity.HomeDiagnoseInfo;
 import com.diagbot.entity.HomeOperationInfo;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.HomeOperationInfoServiceImpl;
@@ -94,11 +93,11 @@ public class AHomeOperationInfoFacade extends HomeOperationInfoServiceImpl{
 
     public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
         //验证数据是否存在
-        if(StringUtil.isNotBlank(aDeleteFlagVO.getHomePageId())) {
+        if(StringUtil.isBlank(aDeleteFlagVO.getHomePageId())) {
             return RespDTO.onError("住院手术未输入病案首页编号!");
         }else if(aDeleteFlagVO.getHospitalId()==null){
             return RespDTO.onError("住院手术未输入医院编码!");
-        }else if(StringUtil.isNotBlank(aDeleteFlagVO.getOperationOrderNo())){
+        }else if(StringUtil.isBlank(aDeleteFlagVO.getOperationOrderNo())){
             return RespDTO.onError("住院手术未输入顺序号!");
         }else {
             UpdateWrapper<HomeOperationInfo> updateWrapper=new UpdateWrapper<>();

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

@@ -294,17 +294,17 @@ public class AHomePageFacade extends HomePageServiceImpl{
 
     public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
         //验证数据是否存在
-       if(StringUtil.isNotBlank(aDeleteFlagVO.getHomePageId())) {
+       if(StringUtil.isBlank(aDeleteFlagVO.getHomePageId())) {
             return RespDTO.onError("请输入病案首页编号!");
        }else if(aDeleteFlagVO.getHospitalId()==null){
             return RespDTO.onError("请输入医院编码!");
-       }else if(StringUtil.isNotBlank(aDeleteFlagVO.getBehospitalCode())){
+       }else if(StringUtil.isBlank(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("behospital_code", aDeleteFlagVO.getBehospitalCode())
                     .eq("is_deleted",IsDeleteEnum.N)
                     .set("is_deleted",IsDeleteEnum.Y)
                     .set("gmt_modified", DateUtil.now());

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

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.AMedCrisisDTO;
-import com.diagbot.entity.HomePage;
 import com.diagbot.entity.MedCrisisInfo;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.MedCrisisInfoServiceImpl;
@@ -89,9 +88,9 @@ public class AMedCrisisFacade extends MedCrisisInfoServiceImpl{
 
     public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
         //验证数据是否存在
-        if(StringUtil.isNotBlank(aDeleteFlagVO.getRecId())){
+        if(StringUtil.isBlank(aDeleteFlagVO.getRecId())){
             return RespDTO.onError("请输入文书编码!");
-        }else if(StringUtil.isNotBlank(aDeleteFlagVO.getBehospitalCode())) {
+        }else if(StringUtil.isBlank(aDeleteFlagVO.getBehospitalCode())) {
             return RespDTO.onError("请输入病人住院编码!");
         }else if(aDeleteFlagVO.getHospitalId()==null){
             return RespDTO.onError("请输入医院编码!");

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

@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.AMedicalRecordContentDTO;
-import com.diagbot.entity.HomePage;
-import com.diagbot.entity.MedicalRecord;
 import com.diagbot.entity.MedicalRecordContent;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.MedicalRecordContentServiceImpl;
@@ -20,7 +18,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
-import java.util.*;
+import java.util.Date;
+import java.util.List;
 
 @Component
 public class AMedicalRecordContentFacade extends MedicalRecordContentServiceImpl{
@@ -85,7 +84,7 @@ public class AMedicalRecordContentFacade extends MedicalRecordContentServiceImpl
 
     public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
         //验证数据是否存在
-        if (StringUtil.isNotBlank(aDeleteFlagVO.getRecId())) {
+        if (StringUtil.isBlank(aDeleteFlagVO.getRecId())) {
             return RespDTO.onError("请输入文书序号!");
         } else if (aDeleteFlagVO.getHospitalId() == null) {
             return RespDTO.onError("请输入医院编码!");

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

@@ -304,11 +304,11 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
 
     public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){
         //验证数据是否存在
-        if (StringUtil.isNotBlank(aDeleteFlagVO.getRecId())) {
+        if (StringUtil.isBlank(aDeleteFlagVO.getRecId())) {
             return RespDTO.onError("请输入文书序号!");
         } else if (aDeleteFlagVO.getHospitalId() == null) {
             return RespDTO.onError("请输入医院编码!");
-        } else if (StringUtil.isNotBlank(aDeleteFlagVO.getBehospitalCode())) {
+        } else if (StringUtil.isBlank(aDeleteFlagVO.getBehospitalCode())) {
             return RespDTO.onError("请输入病人住院编码!");
         }else {
             UpdateWrapper<MedicalRecord> updateWrapper=new UpdateWrapper<>();
@@ -321,15 +321,17 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
 
             Boolean flag=update(new MedicalRecord(),updateWrapper);
 
-            UpdateWrapper<MedicalRecordContent> updateWrapperContent=new UpdateWrapper<>();
-            updateWrapperContent.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());
+            if(true){
+                UpdateWrapper<MedicalRecordContent> updateWrapperContent=new UpdateWrapper<>();
+                updateWrapperContent.eq("rec_id", aDeleteFlagVO.getRecId())
+                        .eq("hospital_id", aDeleteFlagVO.getHospitalId())
+                        .eq("is_deleted",IsDeleteEnum.N)
+                        .set("is_deleted",IsDeleteEnum.Y)
+                        .set("gmt_modified", DateUtil.now());
 
-            Boolean flagContent=aMedicalRecordContentFacade.update(new MedicalRecordContent(),updateWrapperContent);
+                Boolean flagContent=aMedicalRecordContentFacade.update(new MedicalRecordContent(),updateWrapperContent);
+                return RespDTO.onSuc(flagContent);
+            }
             return RespDTO.onSuc(flag);
         }
     }