jiangjiazhi / regional-platform

Commit 3f9cbbbe2b125be523ab004c3221e09370763797

Authored by yangfei over 7 years ago

Exists in master and in 6 other branches

初诊修改时同步修改转入孕妇高危相关信息

Showing 2 changed files with 59 additions and 4 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java

...	...	@@ -414,5 +414,51 @@
414	414	public void setTransferredHospital(String transferredHospital) {
415	415	this.transferredHospital = transferredHospital;
416	416	}
	417	+
	418	+ @Override
	419	+ public String toString() {
	420	+ return "ReferralApplyOrderModel{" +
	421	+ "id='" + id + '\'' +
	422	+ ", parentId='" + parentId + '\'' +
	423	+ ", pid='" + pid + '\'' +
	424	+ ", name='" + name + '\'' +
	425	+ ", mname='" + mname + '\'' +
	426	+ ", age=" + age +
	427	+ ", sex=" + sex +
	428	+ ", phone='" + phone + '\'' +
	429	+ ", birth=" + birth +
	430	+ ", dueWeek=" + dueWeek +
	431	+ ", days=" + days +
	432	+ ", lastMenses=" + lastMenses +
	433	+ ", otherHighRisk='" + otherHighRisk + '\'' +
	434	+ ", pStatus=" + pStatus +
	435	+ ", cardNo='" + cardNo + '\'' +
	436	+ ", mCardNo='" + mCardNo + '\'' +
	437	+ ", dueDate=" + dueDate +
	438	+ ", rLevel=" + rLevel +
	439	+ ", rRisk=" + rRisk +
	440	+ ", score=" + score +
	441	+ ", transferredHospital='" + transferredHospital + '\'' +
	442	+ ", outHospitalId='" + outHospitalId + '\'' +
	443	+ ", hospitalId='" + hospitalId + '\'' +
	444	+ ", expVip=" + expVip +
	445	+ ", transferredDepartment='" + transferredDepartment + '\'' +
	446	+ ", diseaseDesc='" + diseaseDesc + '\'' +
	447	+ ", transferredDisease='" + transferredDisease + '\'' +
	448	+ ", potentialRisk='" + potentialRisk + '\'' +
	449	+ ", transferMode='" + transferMode + '\'' +
	450	+ ", applyDoctor='" + applyDoctor + '\'' +
	451	+ ", received=" + received +
	452	+ ", recDoctor='" + recDoctor + '\'' +
	453	+ ", created=" + created +
	454	+ ", modified=" + modified +
	455	+ ", status=" + status +
	456	+ ", type=" + type +
	457	+ ", serviceType=" + serviceType +
	458	+ ", operator='" + operator + '\'' +
	459	+ ", diagnosis='" + diagnosis + '\'' +
	460	+ ", otherDiagn='" + otherDiagn + '\'' +
	461	+ '}';
	462	+ }
417	463	}

...	...	@@ -87,6 +87,8 @@
87	87	private ModularFunctionConfigService modularFunctionConfigServcie;
88	88	@Autowired
89	89	private PatientCheckTicketService patientCheckTicketService;
	90	+ @Autowired
	91	+ private CommonService commonService;
90	92
91	93	@Autowired
92	94	private CouponService couponService;
...	...	@@ -442,6 +444,8 @@
442	444	commonThreadPool.execute(new Runnable() {
443	445	@Override
444	446	public void run() {
	447	+ Patients patients = patientsService.findOnePatientById(parentId);
	448	+
445	449	ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
446	450	referralApplyOrderQuery.setParentId(parentId);
447	451
448	452
449	453
450	454
...	...	@@ -450,12 +454,20 @@
450	454	//其他诊断
451	455	referralApplyOrderModel.setOtherDiagn(antenatalExamination.getOtherRisk());
452	456	referralApplyOrderModel.setDiagnosis(antenatalExamination.getDiagnosis());
	457	+ List<String> rlevel=Collections.emptyList();
	458	+ if(StringUtils.isNotEmpty(patients.getRiskLevelId())&&!"[]".equals(patients.getRiskLevelId())){
	459	+ rlevel= JsonUtil.jkstr2Obj(patients.getRiskLevelId(), List.class);
	460	+ com.lyms.platform.operate.web.utils.CollectionUtils.removeDuplicate(rlevel,true);
	461	+ }
	462	+ referralApplyOrderModel.setrLevel(rlevel);
453	463	try {
454	464	List l = JsonUtil.toList(antenatalExamination.getRiskFactor(), List.class);
455	465	referralApplyOrderModel.setrRisk(queryRiskName(l));
	466	+ System.out.println("待修改转诊信息："+referralApplyOrderModel.toString());
456	467	} catch (Exception e) {
	468	+ e.printStackTrace();
457	469	}
458		-
	470	+ System.out.println("查询转诊条件："+referralApplyOrderQuery.convertToQuery().convertToMongoQuery());
459	471	applyOrderService.updateByParentId(referralApplyOrderQuery, referralApplyOrderModel);
460	472	}
461	473	});
...	...	@@ -1421,9 +1433,6 @@
1421	1433	* 处理产程数据
1422	1434	*/
1423	1435	private void distPatientData(List<Patients> patientses, List<List<AntData>> sortList) {
1424		- Set<List<AntData>> resultDatas = new TreeSet<>();
1425		-
1426		-
1427	1436	Iterator<Patients> iterator = patientses.iterator();
1428	1437	Organization organization = null;
1429	1438	String patientId = "";