diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java index 6f19ae2..174b710 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java @@ -39,6 +39,11 @@ public class PatientsService { @Autowired private IReferralApplyOrderDao iReferralApplyOrderDao; @Autowired + private YunBookbuildingService yunBookbuildingService; + @Autowired + private ApplyScreeningService applyScreeningService; + + @Autowired private PersonService personService; @Autowired private IAntExRecordDao iAntExRecordDao; @@ -549,8 +554,12 @@ public class PatientsService { if (patients != null) { //修改产筛s updateSieve(patients); + //修改产筛申请单 + updateSieveApplyOrder(patients); //修改转诊 updateRefer(patients); + //修改医联体转诊 + updateyltRefer(patients); //修改产检管理信息 updateExRecord(patients); } @@ -694,6 +703,31 @@ public class PatientsService { } } + /** + * 修改产筛申请单中的末次月经数据 + * + * @param patients + * @Author: 武涛涛 + * @Date: 2020/8/11 16:14 + */ + public void updateSieveApplyOrder(Patients patients) { + if (null != patients && StringUtils.isNotEmpty(patients.getId()) && null != patients.getLastMenses()) { + + SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery(); + sieveApplyOrderQuery.setParentId(patients.getId()); + sieveApplyOrderQuery.setYn(YnEnums.YES.getId()); + sieveApplyOrderQuery.setHospitalId(patients.getHospitalId()); + List list1 = sieveApplyOrderDao.queryList(sieveApplyOrderQuery.convertToQuery()); + for (int i = 0; i < list1.size(); i++) { + SieveApplyOrderModel sieveApplyOrderModel = list1.get(i); + sieveApplyOrderModel.setId(sieveApplyOrderModel.getId()); + sieveApplyOrderModel.setLastMenses(patients.getLastMenses()); + sieveApplyOrderDao.updateSieve(sieveApplyOrderModel); + } + + } + } + public void updateRefer(BabyModel babyModel) { ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); @@ -738,7 +772,40 @@ public class PatientsService { } } } + /** + * 医联体 修改转诊数据 + * + * @param patients + */ + public void updateyltRefer(Patients patients) { + if(patients!=null && StringUtils.isNotEmpty(patients.getId())){ + patients = yunBookbuildingService.findOneById(patients.getId()); + }else { + return; + } + ReferralApplyScreeningQuery referralApplyScreeningQuery = new ReferralApplyScreeningQuery(); + referralApplyScreeningQuery.setPid(patients.getPid()); + referralApplyScreeningQuery.setHospitalId(patients.getHospitalId()); + List screeningModels =applyScreeningService.queryReferralApplyScreeningWithQuery(referralApplyScreeningQuery); + + if (CollectionUtils.isNotEmpty(screeningModels)) { + for (ReferralApplyScreeningModel referralApplyScreeningModel : screeningModels) { + + //查询转入申请单 + ReferralApplyScreeningQuery referralApplyScreeningQuery1 = new ReferralApplyScreeningQuery(); + referralApplyScreeningQuery1.setId(referralApplyScreeningModel.getId()); + + referralApplyScreeningModel.setBirth(patients.getBirth()); + referralApplyScreeningModel.setLastMenses(patients.getLastMenses()); + referralApplyScreeningModel.setName(patients.getUsername()); + referralApplyScreeningModel.setCardNo(patients.getCardNo()); + referralApplyScreeningModel.setPhone(patients.getPhone()); + applyScreeningService.updateByParentId(referralApplyScreeningQuery1,referralApplyScreeningModel); + } + } + + } public SieveModel convertToModel(Patients patients) { SieveModel sieveModel = new SieveModel(); sieveModel.setParentId(patients.getId()); diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/DiagnosisModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/DiagnosisModel.java index e5dd436..d70696f 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/DiagnosisModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/DiagnosisModel.java @@ -424,7 +424,11 @@ public class DiagnosisModel extends BaseModel { map.put("modified",DateUtil.getyyyy_MM_dd(modified)); map.put("status",status); map.put("diaStatus",diaStatus); - map.put("nowWeek",DateUtil.getPregnancyWeek(lastMenses,new Date())); + if(patients!=null && patients.getLastMenses()!=null){ + map.put("nowWeek",DateUtil.getPregnancyWeek(patients.getLastMenses(),new Date())); + }else { + map.put("nowWeek",DateUtil.getPregnancyWeek(lastMenses,new Date())); + } map.put("rsResult",rsResult); map.put("diaResult",diaResult); map.put("applyWeek",applyWeek); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index 3836ad4..4474aab 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -3585,7 +3585,7 @@ public class SieveFacade { sieveAddRequest.setuE3(importResult.getuE3UPDCN浓度()); } if (StringUtils.isNotEmpty(importResult.getuE3UPDCN校正MOM值())) { //uE3MOM - sieveAddRequest.setuE3(importResult.getuE3UPDCN校正MOM值()); + sieveAddRequest.setuE3Mom(importResult.getuE3UPDCN校正MOM值()); } //sieveAddRequest.setCheckerId(); //sieveAddRequest.setExamineId();