shiyang / regional-platform

Authored by jiangjiazhi over 8 years ago

Showing 2 changed files with 33 additions and 0 deletions

...	...	@@ -552,6 +552,18 @@
552	552	}
553	553	}
554	554	babyApplyOrderResult.convert(applyOrderModel, zhuanCName, zhuanRname);
	555	+
	556	+ BabyModel babyModel = babyService.getOneBabyById(applyOrderModel.getParentId());
	557	+ if (null != babyModel) {
	558	+ babyApplyOrderResult.setVcCardNo(babyModel.getVcCardNo());
	559	+ if (StringUtils.isNotEmpty(babyModel.getParentId())) {
	560	+ Patients patients = patientsService.findOnePatientById(babyModel.getParentId());
	561	+ if (null != patients) {
	562	+ babyApplyOrderResult.setmCardNo(patients.getCardNo());
	563	+ }
	564	+ }
	565	+ }
	566	+
555	567	String diagnose = "";
556	568	if (CollectionUtils.isNotEmpty(diagnoseList)) {
557	569	diagnose = "";

...	...	@@ -17,6 +17,11 @@
17	17	public static final String SPIT = "-";
18	18	private String id;
19	19	private String pid;
	20	+ //母亲身份证
	21	+ private String mCardNo;
	22	+ //儿童就诊卡
	23	+ private String vcCardNo;
	24	+
20	25	//名字
21	26	private String name;
22	27	//高危转诊
...	...	@@ -72,6 +77,22 @@
72	77	return SPIT;
73	78	}
74	79	return recDoctor;
	80	+ }
	81	+
	82	+ public String getmCardNo() {
	83	+ return mCardNo;
	84	+ }
	85	+
	86	+ public void setmCardNo(String mCardNo) {
	87	+ this.mCardNo = mCardNo;
	88	+ }
	89	+
	90	+ public String getVcCardNo() {
	91	+ return vcCardNo;
	92	+ }
	93	+
	94	+ public void setVcCardNo(String vcCardNo) {
	95	+ this.vcCardNo = vcCardNo;
75	96	}
76	97
77	98	public void setRecDoctor(String recDoctor) {