jiangjiazhi / regional-platform

Commit 4a14cc89c48d60bfdf4ab7c23ed64c2a3c91214d

Authored by wtt over 5 years ago

Exists in master and in 6 other branches

末次月经涉及修改

Showing 3 changed files with 73 additions and 2 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java
platform-dal/src/main/java/com/lyms/platform/pojo/DiagnosisModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java

...	...	@@ -39,6 +39,11 @@
39	39	@Autowired
40	40	private IReferralApplyOrderDao iReferralApplyOrderDao;
41	41	@Autowired
	42	+ private YunBookbuildingService yunBookbuildingService;
	43	+ @Autowired
	44	+ private ApplyScreeningService applyScreeningService;
	45	+
	46	+ @Autowired
42	47	private PersonService personService;
43	48	@Autowired
44	49	private IAntExRecordDao iAntExRecordDao;
45	50
...	...	@@ -549,8 +554,12 @@
549	554	if (patients != null) {
550	555	//修改产筛s
551	556	updateSieve(patients);
	557	+ //修改产筛申请单
	558	+ updateSieveApplyOrder(patients);
552	559	//修改转诊
553	560	updateRefer(patients);
	561	+ //修改医联体转诊
	562	+ updateyltRefer(patients);
554	563	//修改产检管理信息
555	564	updateExRecord(patients);
556	565	}
557	566
...	...	@@ -694,7 +703,32 @@
694	703	}
695	704	}
696	705
	706	+ /**
	707	+ * 修改产筛申请单中的末次月经数据
	708	+ *
	709	+ * @param patients
	710	+ * @Author: 武涛涛
	711	+ * @Date: 2020/8/11 16:14
	712	+ */
	713	+ public void updateSieveApplyOrder(Patients patients) {
	714	+ if (null != patients && StringUtils.isNotEmpty(patients.getId()) && null != patients.getLastMenses()) {
697	715
	716	+ SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery();
	717	+ sieveApplyOrderQuery.setParentId(patients.getId());
	718	+ sieveApplyOrderQuery.setYn(YnEnums.YES.getId());
	719	+ sieveApplyOrderQuery.setHospitalId(patients.getHospitalId());
	720	+ List<SieveApplyOrderModel> list1 = sieveApplyOrderDao.queryList(sieveApplyOrderQuery.convertToQuery());
	721	+ for (int i = 0; i < list1.size(); i++) {
	722	+ SieveApplyOrderModel sieveApplyOrderModel = list1.get(i);
	723	+ sieveApplyOrderModel.setId(sieveApplyOrderModel.getId());
	724	+ sieveApplyOrderModel.setLastMenses(patients.getLastMenses());
	725	+ sieveApplyOrderDao.updateSieve(sieveApplyOrderModel);
	726	+ }
	727	+
	728	+ }
	729	+ }
	730	+
	731	+
698	732	public void updateRefer(BabyModel babyModel) {
699	733	ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
700	734	referralApplyOrderQuery.setParentId(babyModel.getId());
701	735
...	...	@@ -738,7 +772,40 @@
738	772	}
739	773	}
740	774	}
	775	+ /**
	776	+ * 医联体修改转诊数据
	777	+ *
	778	+ * @param patients
	779	+ */
	780	+ public void updateyltRefer(Patients patients) {
741	781
	782	+ if(patients!=null && StringUtils.isNotEmpty(patients.getId())){
	783	+ patients = yunBookbuildingService.findOneById(patients.getId());
	784	+ }else {
	785	+ return;
	786	+ }
	787	+ ReferralApplyScreeningQuery referralApplyScreeningQuery = new ReferralApplyScreeningQuery();
	788	+ referralApplyScreeningQuery.setPid(patients.getPid());
	789	+ referralApplyScreeningQuery.setHospitalId(patients.getHospitalId());
	790	+ List<ReferralApplyScreeningModel> screeningModels =applyScreeningService.queryReferralApplyScreeningWithQuery(referralApplyScreeningQuery);
	791	+
	792	+ if (CollectionUtils.isNotEmpty(screeningModels)) {
	793	+ for (ReferralApplyScreeningModel referralApplyScreeningModel : screeningModels) {
	794	+
	795	+ //查询转入申请单
	796	+ ReferralApplyScreeningQuery referralApplyScreeningQuery1 = new ReferralApplyScreeningQuery();
	797	+ referralApplyScreeningQuery1.setId(referralApplyScreeningModel.getId());
	798	+
	799	+ referralApplyScreeningModel.setBirth(patients.getBirth());
	800	+ referralApplyScreeningModel.setLastMenses(patients.getLastMenses());
	801	+ referralApplyScreeningModel.setName(patients.getUsername());
	802	+ referralApplyScreeningModel.setCardNo(patients.getCardNo());
	803	+ referralApplyScreeningModel.setPhone(patients.getPhone());
	804	+ applyScreeningService.updateByParentId(referralApplyScreeningQuery1,referralApplyScreeningModel);
	805	+ }
	806	+ }
	807	+
	808	+ }
742	809	public SieveModel convertToModel(Patients patients) {
743	810	SieveModel sieveModel = new SieveModel();
744	811	sieveModel.setParentId(patients.getId());

...	...	@@ -424,7 +424,11 @@
424	424	map.put("modified",DateUtil.getyyyy_MM_dd(modified));
425	425	map.put("status",status);
426	426	map.put("diaStatus",diaStatus);
427		- map.put("nowWeek",DateUtil.getPregnancyWeek(lastMenses,new Date()));
	427	+ if(patients!=null && patients.getLastMenses()!=null){
	428	+ map.put("nowWeek",DateUtil.getPregnancyWeek(patients.getLastMenses(),new Date()));
	429	+ }else {
	430	+ map.put("nowWeek",DateUtil.getPregnancyWeek(lastMenses,new Date()));
	431	+ }
428	432	map.put("rsResult",rsResult);
429	433	map.put("diaResult",diaResult);
430	434	map.put("applyWeek",applyWeek);

...	...	@@ -3585,7 +3585,7 @@
3585	3585	sieveAddRequest.setuE3(importResult.getuE3UPDCN浓度());
3586	3586	}
3587	3587	if (StringUtils.isNotEmpty(importResult.getuE3UPDCN校正MOM值())) { //uE3MOM
3588		- sieveAddRequest.setuE3(importResult.getuE3UPDCN校正MOM值());
	3588	+ sieveAddRequest.setuE3Mom(importResult.getuE3UPDCN校正MOM值());
3589	3589	}
3590	3590	//sieveAddRequest.setCheckerId();
3591	3591	//sieveAddRequest.setExamineId();