jiangjiazhi / regional-platform

Commit f9b2d853c021f24be2968f34740441f9921896b6

Authored by dongqin almost 6 years ago

Exists in master and in 6 other branches

修复bug

Showing 4 changed files with 238 additions and 0 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java

...	...	@@ -3091,6 +3091,21 @@
3091	3091
3092	3092	antenatalExaminationResult.setIsSieve(cap(data, examinationModel.getParentId()));
3093	3093	antenatalExaminationResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery)) ? 0 : 1);
	3094	+
	3095	+ // 丰润字段的添加
	3096	+ antenatalExaminationResult.setGongGaoSelect(examinationModel.getGongGaoSelect());
	3097	+ antenatalExaminationResult.setFuweiSelect(examinationModel.getFuweiSelect());
	3098	+ antenatalExaminationResult.setEdemaSelect(examinationModel.getEdemaSelect());
	3099	+ antenatalExaminationResult.setTireNumberSelect(examinationModel.getTireNumberSelect());
	3100	+ antenatalExaminationResult.setQuickenSelect(examinationModel.getQuickenSelect());
	3101	+ antenatalExaminationResult.setXhdbSelect(examinationModel.getXhdbSelect());
	3102	+ antenatalExaminationResult.setXhdbSelectOtherVal(examinationModel.getXhdbSelectOtherVal());
	3103	+ antenatalExaminationResult.setNdbSelect(examinationModel.getNdbSelect());
	3104	+ antenatalExaminationResult.setNdbSelectOtherVal(examinationModel.getNdbSelectOtherVal());
	3105	+ antenatalExaminationResult.setTireData(examinationModel.getTireData());
	3106	+
	3107	+
	3108	+
3094	3109	object = antenatalExaminationResult;
3095	3110	} else {
3096	3111	//查询初诊数据
...	...	@@ -3204,6 +3219,24 @@
3204	3219
3205	3220	antexChuResult.setGenRemark(antExChuModel.getGenRemark());
3206	3221	antexChuResult.setGynRemark(antExChuModel.getGynRemark());
	3222	+
	3223	+ // 丰润字段的添加
	3224	+
	3225	+
	3226	+ antexChuResult.setGongGaoSelect(antExChuModel.getGonggaoSelect());
	3227	+
	3228	+ // 丰润字段的添加
	3229	+ antexChuResult.setGongGaoSelect(antExChuModel.getGonggaoSelect());
	3230	+ antexChuResult.setFuweiSelect(antExChuModel.getFuweiSelect());
	3231	+ antexChuResult.setEdemaSelect(antExChuModel.getEdemaSelect());
	3232	+ antexChuResult.setTireNumberSelect(antExChuModel.getTireNumberSelect());
	3233	+ antexChuResult.setQuickenSelect(antExChuModel.getQuickenSelect());
	3234	+ antexChuResult.setXhdbSelect(antExChuModel.getXhdbSelect());
	3235	+ antexChuResult.setXhdbSelectOtherVal(antExChuModel.getXhdbSelectOtherVal());
	3236	+ antexChuResult.setNdbSelect(antExChuModel.getNdbSelect());
	3237	+ antexChuResult.setNdbSelectOtherVal(antExChuModel.getNdbSelectOtherVal());
	3238	+ antexChuResult.setPlacentas(antExChuModel.getPlacentas());
	3239	+
3207	3240
3208	3241
3209	3242	object = antexChuResult;

...	...	@@ -1820,6 +1820,17 @@
1820	1820	if (placenta.getYszs() != null) {
1821	1821	placetaMap.put("yszs", UnitUtils.unitSplice(placenta.getYszs(), UnitConstants.CM));
1822	1822	}
	1823	+
	1824	+ // 丰润字段添加
	1825	+ if (StringUtils.isNotEmpty(placenta.getHeartRateSelect())){
	1826	+ placetaMap.put("heartRateSelect", placenta.getHeartRateSelect());
	1827	+ }
	1828	+ if (StringUtils.isNotEmpty(placenta.getFetalPositionSelect())){
	1829	+ placetaMap.put("fetalPositionSelect", placenta.getFetalPositionSelect());
	1830	+ }
	1831	+ if (StringUtils.isNotEmpty(placenta.getJoinSelect())) {
	1832	+ placetaMap.put("joinSelect", placenta.getJoinSelect());
	1833	+ }
1823	1834	}
1824	1835
1825	1836	if ("java.util.LinkedHashMap".equals(obj.getClass().getName())) {
...	...	@@ -1879,6 +1890,17 @@
1879	1890
1880	1891	if (placenta.get("yszs") != null) {
1881	1892	placetaMap.put("yszs", UnitUtils.unitSplice(placenta.get("yszs"), UnitConstants.CM));
	1893	+ }
	1894	+
	1895	+ // 丰润字段添加
	1896	+ if (placenta.get("heartRateSelect") != null) {
	1897	+ placetaMap.put("heartRateSelect", placenta.get("heartRateSelect"));
	1898	+ }
	1899	+ if (placenta.get("fetalPositionSelect") != null) {
	1900	+ placetaMap.put("fetalPositionSelect", placenta.get("fetalPositionSelect"));
	1901	+ }
	1902	+ if (placenta.get("joinSelect") != null) {
	1903	+ placetaMap.put("joinSelect", placenta.get("joinSelect"));
1882	1904	}
1883	1905	}
1884	1906	}

...	...	@@ -65,6 +65,97 @@
65	65	//结果补充
66	66	private String resultSupple;
67	67
	68	+ //腹围 1-未测 2-拒测
	69	+ private String fuweiSelect;
	70	+ // 浮肿 1-未测 2-拒测
	71	+ private String edemaSelect;
	72	+ // 胎数 1-未测 2-拒测
	73	+ private String tireNumberSelect;
	74	+ /**
	75	+ * 胎动选项 1-未测 2-拒测
	76	+ */
	77	+ private String quickenSelect;
	78	+ /**
	79	+ * 血红蛋白选项 1-可选 2-未测 3-拒测 9-其他
	80	+ **/
	81	+ private String xhdbSelect;
	82	+ /**
	83	+ * 血红蛋白选项其他 - 对应的值
	84	+ **/
	85	+ private String xhdbSelectOtherVal;
	86	+ /**
	87	+ * 尿蛋白选项 1-未测 2-拒测 9-其他
	88	+ */
	89	+ private String ndbSelect;
	90	+ /**
	91	+ * 尿蛋白选项其他 - 对应的值
	92	+ */
	93	+ private String ndbSelectOtherVal;
	94	+
	95	+ public String getFuweiSelect() {
	96	+ return fuweiSelect;
	97	+ }
	98	+
	99	+ public void setFuweiSelect(String fuweiSelect) {
	100	+ this.fuweiSelect = fuweiSelect;
	101	+ }
	102	+
	103	+ public String getEdemaSelect() {
	104	+ return edemaSelect;
	105	+ }
	106	+
	107	+ public void setEdemaSelect(String edemaSelect) {
	108	+ this.edemaSelect = edemaSelect;
	109	+ }
	110	+
	111	+ public String getTireNumberSelect() {
	112	+ return tireNumberSelect;
	113	+ }
	114	+
	115	+ public void setTireNumberSelect(String tireNumberSelect) {
	116	+ this.tireNumberSelect = tireNumberSelect;
	117	+ }
	118	+
	119	+ public String getQuickenSelect() {
	120	+ return quickenSelect;
	121	+ }
	122	+
	123	+ public void setQuickenSelect(String quickenSelect) {
	124	+ this.quickenSelect = quickenSelect;
	125	+ }
	126	+
	127	+ public String getXhdbSelect() {
	128	+ return xhdbSelect;
	129	+ }
	130	+
	131	+ public void setXhdbSelect(String xhdbSelect) {
	132	+ this.xhdbSelect = xhdbSelect;
	133	+ }
	134	+
	135	+ public String getXhdbSelectOtherVal() {
	136	+ return xhdbSelectOtherVal;
	137	+ }
	138	+
	139	+ public void setXhdbSelectOtherVal(String xhdbSelectOtherVal) {
	140	+ this.xhdbSelectOtherVal = xhdbSelectOtherVal;
	141	+ }
	142	+
	143	+ public String getNdbSelect() {
	144	+ return ndbSelect;
	145	+ }
	146	+
	147	+ public void setNdbSelect(String ndbSelect) {
	148	+ this.ndbSelect = ndbSelect;
	149	+ }
	150	+
	151	+ public String getNdbSelectOtherVal() {
	152	+ return ndbSelectOtherVal;
	153	+ }
	154	+
	155	+ public void setNdbSelectOtherVal(String ndbSelectOtherVal) {
	156	+ this.ndbSelectOtherVal = ndbSelectOtherVal;
	157	+ }
	158	+
68	159	public String getVcCardNo() {
69	160	return vcCardNo;
70	161	}

...	...	@@ -530,6 +530,98 @@
530	530	//实验结果
531	531	private String syjgValue;
532	532
	533	+
	534	+ //腹围 1-未测 2-拒测
	535	+ private String fuweiSelect;
	536	+ // 浮肿 1-未测 2-拒测
	537	+ private String edemaSelect;
	538	+ // 胎数 1-未测 2-拒测
	539	+ private String tireNumberSelect;
	540	+ /**
	541	+ * 胎动选项 1-未测 2-拒测
	542	+ */
	543	+ private String quickenSelect;
	544	+ /**
	545	+ * 血红蛋白选项 1-可选 2-未测 3-拒测 9-其他
	546	+ **/
	547	+ private String xhdbSelect;
	548	+ /**
	549	+ * 血红蛋白选项其他 - 对应的值
	550	+ **/
	551	+ private String xhdbSelectOtherVal;
	552	+ /**
	553	+ * 尿蛋白选项 1-未测 2-拒测 9-其他
	554	+ */
	555	+ private String ndbSelect;
	556	+ /**
	557	+ * 尿蛋白选项其他 - 对应的值
	558	+ */
	559	+ private String ndbSelectOtherVal;
	560	+
	561	+ public String getFuweiSelect() {
	562	+ return fuweiSelect;
	563	+ }
	564	+
	565	+ public void setFuweiSelect(String fuweiSelect) {
	566	+ this.fuweiSelect = fuweiSelect;
	567	+ }
	568	+
	569	+ public String getEdemaSelect() {
	570	+ return edemaSelect;
	571	+ }
	572	+
	573	+ public void setEdemaSelect(String edemaSelect) {
	574	+ this.edemaSelect = edemaSelect;
	575	+ }
	576	+
	577	+ public String getTireNumberSelect() {
	578	+ return tireNumberSelect;
	579	+ }
	580	+
	581	+ public void setTireNumberSelect(String tireNumberSelect) {
	582	+ this.tireNumberSelect = tireNumberSelect;
	583	+ }
	584	+
	585	+ public String getQuickenSelect() {
	586	+ return quickenSelect;
	587	+ }
	588	+
	589	+ public void setQuickenSelect(String quickenSelect) {
	590	+ this.quickenSelect = quickenSelect;
	591	+ }
	592	+
	593	+ public String getXhdbSelect() {
	594	+ return xhdbSelect;
	595	+ }
	596	+
	597	+ public void setXhdbSelect(String xhdbSelect) {
	598	+ this.xhdbSelect = xhdbSelect;
	599	+ }
	600	+
	601	+ public String getXhdbSelectOtherVal() {
	602	+ return xhdbSelectOtherVal;
	603	+ }
	604	+
	605	+ public void setXhdbSelectOtherVal(String xhdbSelectOtherVal) {
	606	+ this.xhdbSelectOtherVal = xhdbSelectOtherVal;
	607	+ }
	608	+
	609	+ public String getNdbSelect() {
	610	+ return ndbSelect;
	611	+ }
	612	+
	613	+ public void setNdbSelect(String ndbSelect) {
	614	+ this.ndbSelect = ndbSelect;
	615	+ }
	616	+
	617	+ public String getNdbSelectOtherVal() {
	618	+ return ndbSelectOtherVal;
	619	+ }
	620	+
	621	+ public void setNdbSelectOtherVal(String ndbSelectOtherVal) {
	622	+ this.ndbSelectOtherVal = ndbSelectOtherVal;
	623	+ }
	624	+
533	625	public String getYgbmkyValue() {
534	626	return ygbmkyValue;
535	627	}