|
@@ -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);
|
|
|
}
|
|
|
}
|