diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index f6fa5ef..bcf76ad 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -66,7 +66,9 @@ public class AntenatalExaminationFacade { //修改申请单状态 updateApplyOrder(antenatalExamination, antExAddRequest.getParentId()); //修改孕妇高危等级 - updatePatientRiskLevel(antenatalExamination,patientsService.findOnePatientById(antExAddRequest.getParentId())); + Patients patients =patientsService.findOnePatientById(antExAddRequest.getParentId()); + patients.setLastCheckEmployeeId(userId+""); + updatePatientRiskLevel(antenatalExamination,patients); } else { AntenatalExaminationModel model = antExAddRequest.convertToDataModel(); model.setYn(YnEnums.YES.getId()); @@ -83,6 +85,7 @@ public class AntenatalExaminationFacade { return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("同一天只能建一次复诊"); } Patients patients = patientsService.findOnePatientById(antExAddRequest.getParentId()); + patients.setLastCheckEmployeeId(userId+""); model.setPid(patients.getPid()); antenatalExaminationService.addOneBabyAnt(model); //修改申请单状态 @@ -122,6 +125,7 @@ public class AntenatalExaminationFacade { antenatalExaminationService.updateAntExChu(antExChuModel, antExChuModel.getId()); Patients patients = patientsService.findOnePatientById(excAddRequest.getParentId()); + patients.setLastCheckEmployeeId(userId+""); //修改患者风险等级 updatePatientRiskLevel(antExChuModel, patients); } else { @@ -148,6 +152,7 @@ public class AntenatalExaminationFacade { antExChuModel.setYn(YnEnums.YES.getId()); antenatalExaminationService.addOneAntEx(antExChuModel); //修改患者风险等级 + patients.setLastCheckEmployeeId(userId+""); updatePatientRiskLevel(antExChuModel, patients); } return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index e03a4c6..191b277 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -12,6 +12,8 @@ import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.operate.web.request.*; import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.utils.CommonsHelper; +import com.lyms.platform.permission.model.Users; +import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.AntenatalExaminationModel; import com.lyms.platform.pojo.BabyModel; import com.lyms.platform.pojo.CommunityConfig; @@ -22,6 +24,7 @@ import com.lyms.platform.query.BabyModelQuery; import com.lyms.platform.query.PatientsQuery; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.math.NumberUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; import org.springframework.stereotype.Component; @@ -52,6 +55,8 @@ public class PatientFacade { private AntenatalExaminationService antExService; @Autowired private AntenatalExaminationFacade antenatalExaminationFacade; + @Autowired + private UsersService usersService; /** @@ -265,7 +270,22 @@ public class PatientFacade { chanResult.convertToResult(patients); antExQuery.setParentId(patients.getId()); antExQuery.setYn(YnEnums.YES.getId()); - + if(StringUtils.isNotEmpty(patients.getBookbuildingDoctor())){ + if(NumberUtils.isNumber(patients.getBookbuildingDoctor())){ + Users users = usersService.getUsers(NumberUtils.toInt(patients.getBookbuildingDoctor())); + chanResult.setlName(users.getName()); + }else{ + chanResult.setlName(patients.getBookbuildingDoctor()); + } + } + if(StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())){ + if(NumberUtils.isNumber(patients.getLastCheckEmployeeId())){ + Users users = usersService.getUsers(NumberUtils.toInt(patients.getLastCheckEmployeeId())); + chanResult.setCheckDoctor(users.getName()); + }else{ + chanResult.setCheckDoctor(patients.getLastCheckEmployeeId()); + } + } //复诊次数 int i = antExService.queryAntenatalExaminationCount(antExQuery.convertToQuery()); chanResult.setcTimes(i); @@ -292,6 +312,22 @@ public class PatientFacade { quanPatientsResult.convertToResult(patients); antExQuery.setParentId(patients.getId()); antExQuery.setYn(YnEnums.YES.getId()); + if(StringUtils.isNotEmpty(patients.getBookbuildingDoctor())){ + if(NumberUtils.isNumber(patients.getBookbuildingDoctor())){ + Users users = usersService.getUsers(NumberUtils.toInt(patients.getBookbuildingDoctor())); + quanPatientsResult.setlName(users.getName()); + }else{ + quanPatientsResult.setlName(patients.getBookbuildingDoctor()); + } + } + if(StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())){ + if(NumberUtils.isNumber(patients.getLastCheckEmployeeId())){ + Users users = usersService.getUsers(NumberUtils.toInt(patients.getLastCheckEmployeeId())); + quanPatientsResult.setCheckDoctor(users.getName()); + }else{ + quanPatientsResult.setCheckDoctor(patients.getLastCheckEmployeeId()); + } + } //复诊次数 int i = antExService.queryAntenatalExaminationCount(antExQuery.convertToQuery()); antExChuQuery.setParentId(patients.getId()); @@ -317,6 +353,23 @@ public class PatientFacade { for (Patients patients : patientses) { RiskPatientsResult riskPatientsResult = new RiskPatientsResult(); riskPatientsResult.convertToResult(patients); + if(StringUtils.isNotEmpty(patients.getBookbuildingDoctor())){ + if(NumberUtils.isNumber(patients.getBookbuildingDoctor())){ + Users users = usersService.getUsers(NumberUtils.toInt(patients.getBookbuildingDoctor())); + riskPatientsResult.setlName(users.getName()); + }else{ + riskPatientsResult.setlName(patients.getBookbuildingDoctor()); + } + } + if(StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())){ + if(NumberUtils.isNumber(patients.getLastCheckEmployeeId())){ + Users users = usersService.getUsers(NumberUtils.toInt(patients.getLastCheckEmployeeId())); + riskPatientsResult.setCheckDoctor(users.getName()); + }else{ + riskPatientsResult.setCheckDoctor(patients.getLastCheckEmployeeId()); + } + } + //复诊次数 int i = antExService.queryAntenatalExaminationCount(antExQuery.convertToQuery()); antExChuQuery.setParentId(patients.getId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java index a536b79..0a719ba 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java @@ -172,12 +172,10 @@ public class RiskPatientsResult implements IBasicResultConvert