liquanyu / regional-platform

Commit 5c5182119ad75ad9184699f35734eb91f729149c

Authored by wangbo about 7 years ago

威海字段打印添加

Showing 4 changed files with 155 additions and 59 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java

...	...	@@ -21,11 +21,13 @@
21	21	private static final long serialVersionUID = SerialIdEnum.MaternalDeliverModel.getCid();
22	22
23	23	private String id;
24		- /新加字段*/
	24	+ /**
	25	+ * 新加字段
	26	+ ***/
25	27	//产次
26	28	private Integer dueCount;
27	29	//手工分娩孕周
28		- private Map<String,Object> handDueWeek;
	30	+ private Map<String, Object> handDueWeek;
29	31	//产妇id
30	32	private String parentId;
31	33	private String pid;
...	...	@@ -353,7 +355,7 @@
353	355	this.deathCauseText = deathCauseText;
354	356	}
355	357
356		- public static class Baby implements Serializable{
	358	+ public static class Baby implements Serializable {
357	359
358	360	private static final long serialVersionUID = SerialIdEnum.Baby.getCid();
359	361
360	362
361	363
362	364
363	365
...	...	@@ -405,23 +407,23 @@
405	407	//腭裂
406	408	private boolean jxEl;
407	409	//腭裂左中右
408		- private Map<String,Object> jxelSele;
	410	+ private Map<String, Object> jxelSele;
409	411	//唇裂
410	412	private boolean jxCl;
411	413	//腭裂左中右
412		- private Map<String,Object> jxClSele;
	414	+ private Map<String, Object> jxClSele;
413	415	//唇裂合并腭裂
414	416	private boolean jxClhb;
415	417	//唇裂合并腭裂左中右
416		- private Map<String,Object> jxClhbSele;
	418	+ private Map<String, Object> jxClhbSele;
417	419	//小耳(包括无耳)
418	420	private boolean jxXe;
419	421	//小耳(包括无耳)左右
420		- private Map<String,Object> jxXeSele;
	422	+ private Map<String, Object> jxXeSele;
421	423	//外耳其他畸形(小耳、无耳除外)
422	424	private boolean jxWe;
423	425	//外耳其他畸形(小耳、无耳除外)左右
424		- private Map<String,Object> jxWeSele;
	426	+ private Map<String, Object> jxWeSele;
425	427	//食道闭锁或狭窄
426	428	private boolean jxSdbs;
427	429	//直肠肛门闭锁或狭窄(包括无肛)
428	430
429	431
430	432
431	433
432	434
433	435
...	...	@@ -433,29 +435,29 @@
433	435	//马蹄内翻足
434	436	private boolean jxMtn;
435	437	//马蹄内翻足左右
436		- private Map<String,Object> jxMtnSele;
	438	+ private Map<String, Object> jxMtnSele;
437	439	//多指
438	440	private boolean jxDz;
439	441	//多指左右
440		- private Map<String,Object> jxDzSele;
	442	+ private Map<String, Object> jxDzSele;
441	443	//多趾
442	444	private boolean jxDc;
443	445	//多趾左右
444		- private Map<String,Object> jxDcSele;
	446	+ private Map<String, Object> jxDcSele;
445	447	//并指
446	448	private boolean jxBz;
447	449	//并指左右
448		- private Map<String,Object> jxBzSele;
	450	+ private Map<String, Object> jxBzSele;
449	451	//并趾
450	452	private boolean jxBc;
451	453	//并趾左右
452		- private Map<String,Object> jxBcSele;
	454	+ private Map<String, Object> jxBcSele;
453	455	//肢体短缩包括缺指(趾)、裂手(足)]
454	456	private boolean jxZtds;
455	457	//肢体短缩包括缺指上肢左右
456		- private Map<String,Object> jxZtdsTopSele;
	458	+ private Map<String, Object> jxZtdsTopSele;
457	459	//肢体短缩包括缺指下肢左右
458		- private Map<String,Object> jxZtdsBottomSele;
	460	+ private Map<String, Object> jxZtdsBottomSele;
459	461	//先天性隔疝
460	462	private boolean jxXtxe;
461	463	//脐膨出
...	...	@@ -469,7 +471,7 @@
469	471	//先天性心脏病
470	472	private boolean jxXtx;
471	473	//其他(写明病名并详细描述)
472		- private Map<String,Object> jxOther;
	474	+ private Map<String, Object> jxOther;
473	475
474	476
475	477	/*******威海妇幼新增字段*******/
...	...	@@ -536,7 +538,7 @@
536	538	private String cjfy;//刺激反应
537	539	private String zl;//张力
538	540
539		- public Baby(){
	541	+ public Baby() {
540	542
541	543	}
542	544
543	545
544	546
...	...	@@ -636,15 +638,15 @@
636	638	this.dueTime = dueTime;
637	639	}
638	640
639		- public Baby(BabyModel babyModel){
	641	+ public Baby(BabyModel babyModel) {
640	642	setAsphyxiaM(babyModel.getAsphyxiaM());
641	643	if (null != babyModel.getSex()) {
642		- setBabyGender(babyModel.getSex()+"");
	644	+ setBabyGender(babyModel.getSex() + "");
643	645	}
644	646	setApgarScore(babyModel.getApgarScore());
645	647	setBabyHealthy(babyModel.getBabyHealthy());
646		- if(NumberUtils.isNumber(babyModel.getBabyWeight())){
647		- setBabyWeight((Integer.valueOf(babyModel.getBabyWeight())*1000)+"");
	648	+ if (NumberUtils.isNumber(babyModel.getBabyWeight())) {
	649	+ setBabyWeight((Integer.valueOf(babyModel.getBabyWeight()) * 1000) + "");
648	650	}
649	651	setBabyHeight(babyModel.getBabyHeight());
650	652	setDeformity(babyModel.getMalformation());
...	...	@@ -1445,7 +1447,7 @@
1445	1447	private String tpCondition;//胎盘情况
1446	1448	private String tpShape;//胎盘形状
1447	1449	private String qdfz;//脐带附着
1448		- private Integer twining ;//缠绕
	1450	+ private Integer twining;//缠绕
1449	1451	private String tightness;//松紧程度
1450	1452
1451	1453	private String placentalComplete;//胎盘完整性（0,：完整；1：基本完整；2：不完整）
1452	1454
...	...	@@ -1868,11 +1870,11 @@
1868	1870	/*****威海再次新增字段（12月计划中）*****/
1869	1871	private Integer gravidity;//孕次
1870	1872	private String department;//科室(1：产一；2：产二)
1871		- private Map<String,Object> myzd;//母婴阻断
	1873	+ private Map<String, Object> myzd;//母婴阻断
1872	1874	private String analMode;//镇痛方式（1：无痛；2：无痛+陪娩；3：导乐+陪娩；4：陪娩）
1873	1875	private String hyCondition;//会阴情况（1：Ⅰ度；2：Ⅱ度；3：Ⅲ度；4：侧切）
1874	1876	private String ssRecord;//手术记录
1875		- private Map<String,Object> ssCount;//手术清点
	1877	+ private Map<String, Object> ssCount;//手术清点
1876	1878	private String ssProcedure;//所施手术
1877	1879	private String pgcCxl;//剖宫产出血量
1878	1880	private String totalTwoCxl;//阴道分娩产后2小时总出血量
1879	1881
...	...	@@ -1897,7 +1899,44 @@
1897	1899	private String totalOneCxl;//阴道分娩产后1小时总出血量
1898	1900	private String xsebz;//新生儿备注
1899	1901
	1902	+ /*****威海再再次新增字段（201905月计划中）*****/
	1903	+ private String comment;//指正任意输入
	1904	+ private String AFV;// 羊水量 ml
	1905	+ private Date parturientTime; //临产时间
	1906	+ private String vaginaBloodAmount;//阴道出血量
1900	1907
	1908	+ public String getComment() {
	1909	+ return comment;
	1910	+ }
	1911	+
	1912	+ public void setComment(String comment) {
	1913	+ this.comment = comment;
	1914	+ }
	1915	+
	1916	+ public String getAFV() {
	1917	+ return AFV;
	1918	+ }
	1919	+
	1920	+ public void setAFV(String AFV) {
	1921	+ this.AFV = AFV;
	1922	+ }
	1923	+
	1924	+ public Date getParturientTime() {
	1925	+ return parturientTime;
	1926	+ }
	1927	+
	1928	+ public void setParturientTime(Date parturientTime) {
	1929	+ this.parturientTime = parturientTime;
	1930	+ }
	1931	+
	1932	+ public String getVaginaBloodAmount() {
	1933	+ return vaginaBloodAmount;
	1934	+ }
	1935	+
	1936	+ public void setVaginaBloodAmount(String vaginaBloodAmount) {
	1937	+ this.vaginaBloodAmount = vaginaBloodAmount;
	1938	+ }
	1939	+
1901	1940	public String getYsqk() {
1902	1941	return ysqk;
1903	1942	}
1904	1943
...	...	@@ -2130,11 +2169,11 @@
2130	2169	this.department = department;
2131	2170	}
2132	2171
2133		- public Map<String,Object> getMyzd() {
	2172	+ public Map<String, Object> getMyzd() {
2134	2173	return myzd;
2135	2174	}
2136	2175
2137		- public void setMyzd(Map<String,Object> myzd) {
	2176	+ public void setMyzd(Map<String, Object> myzd) {
2138	2177	this.myzd = myzd;
2139	2178	}
2140	2179
2141	2180
...	...	@@ -2162,11 +2201,11 @@
2162	2201	this.ssRecord = ssRecord;
2163	2202	}
2164	2203
2165		- public Map<String,Object> getSsCount() {
	2204	+ public Map<String, Object> getSsCount() {
2166	2205	return ssCount;
2167	2206	}
2168	2207
2169		- public void setSsCount(Map<String,Object> ssCount) {
	2208	+ public void setSsCount(Map<String, Object> ssCount) {
2170	2209	this.ssCount = ssCount;
2171	2210	}
2172	2211

...	...	@@ -761,6 +761,7 @@
761	761	checkRecord.put("tcType", cmodel.getTcType().toString());
762	762
763	763	checkRecord.put("hospitalId", models.get(0).getHospitalId());
	764	+
764	765	//查询建档医院
765	766	Organization org = organizationService.getOrganization(Integer.valueOf(models.get(0).getHospitalId()));
766	767	if (org != null) {
...	...	@@ -837,6 +838,7 @@
837	838	base.setId(id);
838	839	base.setSex(model.getSex());
839	840	base.setDueWeek(model.getDueWeek());
	841	+ base.setEndCase(String.valueOf(model.getEndCase()));
840	842
841	843	base.setName(model.getName());
842	844	base.setCardNo(model.getMcertNo());
...	...	@@ -924,8 +926,8 @@
924	926	// 把增值服务标记到页面,医生能够知晓，在接种过程中可以适当给予更多关爱
925	927	List<PatientService> patientServiceList = patientServiceService.getServiceListByParentId(model.getId(), 2);
926	928	ArrayList<String> serTypeNameList = new ArrayList<>();
927		- if (CollectionUtils.isNotEmpty(patientServiceList)){
928		- for (PatientService patientService : patientServiceList){
	929	+ if (CollectionUtils.isNotEmpty(patientServiceList)) {
	930	+ for (PatientService patientService : patientServiceList) {
929	931	Integer serType = patientService.getSerType();
930	932	String serTypeName = areaCountFacade.getSerTypeName(serType.toString());
931	933	serTypeNameList.add(serTypeName);

...	...	@@ -18,10 +18,12 @@
18	18	* Created by Administrator on 2016/6/17 0017.
19	19	*/
20	20	@Form
21		-public class MatDeliverAddRequest implements IBasicRequestConvert<MaternalDeliverModel>{
	21	+public class MatDeliverAddRequest implements IBasicRequestConvert<MaternalDeliverModel> {
22	22	private String id;
23	23
24		- /新加字段*/
	24	+ /**
	25	+ * 新加字段
	26	+ ***/
25	27	//产次
26	28	private Integer dueCount;
27	29	//手工分娩孕周
28	30
...	...	@@ -229,11 +231,11 @@
229	231	this.department = department;
230	232	}
231	233
232		- public Map<String,Object> getMyzd() {
	234	+ public Map<String, Object> getMyzd() {
233	235	return myzd;
234	236	}
235	237
236		- public void setMyzd(Map<String,Object> myzd) {
	238	+ public void setMyzd(Map<String, Object> myzd) {
237	239	this.myzd = myzd;
238	240	}
239	241
240	242
...	...	@@ -261,11 +263,11 @@
261	263	this.ssRecord = ssRecord;
262	264	}
263	265
264		- public Map<String,Object> getSsCount() {
	266	+ public Map<String, Object> getSsCount() {
265	267	return ssCount;
266	268	}
267	269
268		- public void setSsCount(Map<String,Object> ssCount) {
	270	+ public void setSsCount(Map<String, Object> ssCount) {
269	271	this.ssCount = ssCount;
270	272	}
271	273
272	274
...	...	@@ -330,11 +332,11 @@
330	332	/*****威海再次新增字段（12月计划中）*****/
331	333	private Integer gravidity;//孕次
332	334	private String department;//科室(1：产一；2：产二)
333		- private Map<String,Object> myzd;//母婴阻断
	335	+ private Map<String, Object> myzd;//母婴阻断
334	336	private String analMode;//镇痛方式（1：无痛；2：无痛+陪娩；3：导乐+陪娩；4：陪娩）
335	337	private String hyCondition;//会阴情况（1：Ⅰ度；2：Ⅱ度；3：Ⅲ度；4：侧切）
336	338	private String ssRecord;//手术记录
337		- private Map<String,Object> ssCount;//手术清点
	339	+ private Map<String, Object> ssCount;//手术清点
338	340	private String ssProcedure;//所施手术(0：无；1：局部麻醉；2：神经阻滞麻醉)
339	341	private String pgcCxl;//剖宫产出血量
340	342	private String totalTwoCxl;//阴道分娩产后2小时总出血量
341	343
342	344
...	...	@@ -359,12 +361,16 @@
359	361	private String totalOneCxl;//阴道分娩产后1小时总出血量
360	362	private String xsebz;//新生儿备注
361	363
	364	+ /*****威海再再次新增字段（201905月计划中）*****/
	365	+ private String comment;//指正任意输入
	366	+ private String AFV;// 羊水量 ml
	367	+ private Date parturientTime; //临产时间
	368	+ private String vaginaBloodAmount;//阴道出血量
362	369
363	370
364		-
365	371	@Override
366	372	public MaternalDeliverModel convertToDataModel() {
367		- MaternalDeliverModel maternalDeliverModel=new MaternalDeliverModel();
	373	+ MaternalDeliverModel maternalDeliverModel = new MaternalDeliverModel();
368	374	maternalDeliverModel.setHandDueWeek(handDueWeek);
369	375	maternalDeliverModel.setDueCount(dueCount);
370	376	maternalDeliverModel.setFmType(fmType);
371	377
...	...	@@ -452,7 +458,13 @@
452	458	maternalDeliverModel.setZypbfm(zypbfm);
453	459	maternalDeliverModel.setTotalOneCxl(totalOneCxl);
454	460	maternalDeliverModel.setXsebz(xsebz);
	461	+ /*****威海再再次新增字段（201905月计划中）*****/
	462	+ maternalDeliverModel.setAFV(AFV);
	463	+ maternalDeliverModel.setComment(comment);
	464	+ maternalDeliverModel.setParturientTime(parturientTime);
	465	+ maternalDeliverModel.setVaginaBloodAmount(vaginaBloodAmount);
455	466
	467	+
456	468	return maternalDeliverModel;
457	469	}
458	470
...	...	@@ -755,7 +767,6 @@
755	767	}
756	768
757	769
758		-
759	770	public String getNeedleNum() {
760	771	return needleNum;
761	772	}
...	...	@@ -765,7 +776,6 @@
765	776	}
766	777
767	778
768		-
769	779	public String getOperationCause() {
770	780	return operationCause;
771	781	}
...	...	@@ -807,7 +817,6 @@
807	817	}
808	818
809	819
810		-
811	820	public String getPulse() {
812	821	return pulse;
813	822	}
...	...	@@ -817,8 +826,6 @@
817	826	}
818	827
819	828
820		-
821		-
822	829	public Map getCh2Bp() {
823	830	return ch2Bp;
824	831	}
...	...	@@ -883,7 +890,39 @@
883	890	this.totalprocess = totalprocess;
884	891	}
885	892
886		- public static class Placenta implements Serializable{
	893	+ public String getComment() {
	894	+ return comment;
	895	+ }
	896	+
	897	+ public void setComment(String comment) {
	898	+ this.comment = comment;
	899	+ }
	900	+
	901	+ public String getAFV() {
	902	+ return AFV;
	903	+ }
	904	+
	905	+ public void setAFV(String AFV) {
	906	+ this.AFV = AFV;
	907	+ }
	908	+
	909	+ public Date getParturientTime() {
	910	+ return parturientTime;
	911	+ }
	912	+
	913	+ public void setParturientTime(Date parturientTime) {
	914	+ this.parturientTime = parturientTime;
	915	+ }
	916	+
	917	+ public String getVaginaBloodAmount() {
	918	+ return vaginaBloodAmount;
	919	+ }
	920	+
	921	+ public void setVaginaBloodAmount(String vaginaBloodAmount) {
	922	+ this.vaginaBloodAmount = vaginaBloodAmount;
	923	+ }
	924	+
	925	+ public static class Placenta implements Serializable {
887	926	private static final long serialVersionUID = SerialIdEnum.Placenta.getCid();
888	927	//心率
889	928	private Double heartRate;
890	929
...	...	@@ -1025,9 +1064,11 @@
1025	1064	public void setYszs(Double yszs) {
1026	1065	this.yszs = yszs;
1027	1066	}
	1067	+
	1068	+
1028	1069	}
1029	1070
1030		- public static class Baby implements IBasicRequestConvert<MaternalDeliverModel.Baby>{
	1071	+ public static class Baby implements IBasicRequestConvert<MaternalDeliverModel.Baby> {
1031	1072
1032	1073	private String id;
1033	1074	//新生儿性别;
1034	1075
1035	1076
1036	1077
...	...	@@ -1207,15 +1248,19 @@
1207	1248	private String cjfy;//刺激反应
1208	1249	private String zl;//张力
1209	1250
	1251	+ /*******201905计划威海妇幼新增字段*******/
	1252	+ private String babyQX; //新生儿去向 1.病房 2.NICU 3.转院 4.其他
	1253	+ private String other;
	1254	+
1210	1255	@Override
1211	1256	public MaternalDeliverModel.Baby convertToDataModel() {
1212		- MaternalDeliverModel.Baby baby= new MaternalDeliverModel.Baby();
	1257	+ MaternalDeliverModel.Baby baby = new MaternalDeliverModel.Baby();
1213	1258	baby.setId(id);
1214	1259	baby.setAsphyxiaM(asphyxiaM);
1215		- if(null!=babyGender){
	1260	+ if (null != babyGender) {
1216	1261	baby.setBabyGender(babyGender);
1217	1262	}
1218		- if(null!=apgarScore){
	1263	+ if (null != apgarScore) {
1219	1264	baby.setApgarScore(JsonUtil.obj2JsonString(apgarScore));
1220	1265	}
1221	1266	baby.setBabyHealthy(babyHealthy);
...	...	@@ -2184,6 +2229,7 @@
2184	2229	public void setPregnancyOut(String pregnancyOut) {
2185	2230	this.pregnancyOut = pregnancyOut;
2186	2231	}
	2232	+
2187	2233
2188	2234	@Override
2189	2235	public String toString() {

...	...	@@ -8,13 +8,13 @@
8	8	*/
9	9	public class BabyBasicResult {
10	10
11		- private List<Map<String,Object>> mHighRiskReason;
	11	+ private List<Map<String, Object>> mHighRiskReason;
12	12
13		- public List<Map<String,Object>> getmHighRiskReason() {
	13	+ public List<Map<String, Object>> getmHighRiskReason() {
14	14	return mHighRiskReason;
15	15	}
16	16
17		- public void setmHighRiskReason(List<Map<String,Object>> mHighRiskReason) {
	17	+ public void setmHighRiskReason(List<Map<String, Object>> mHighRiskReason) {
18	18	this.mHighRiskReason = mHighRiskReason;
19	19	}
20	20
21	21
...	...	@@ -53,9 +53,12 @@
53	53	private Integer dueWeek;
54	54	//预产期
55	55	private String dueDate;
	56	+ //结案状态
	57	+ private String endCase;
	58	+
56	59	/**
57		- * 1, "有效",0, "无效"
58		- * 如果是孕妇分娩自动建档则无效，当完善时修改成有效
	60	+ * 1, "有效",0, "无效"
	61	+ * 如果是孕妇分娩自动建档则无效，当完善时修改成有效
59	62	*/
60	63	private Integer yn;
61	64	/**
...	...	@@ -74,6 +77,14 @@
74	77	*/
75	78	private List<String> serviceList;
76	79
	80	+ public String getEndCase() {
	81	+ return endCase;
	82	+ }
	83	+
	84	+ public void setEndCase(String endCase) {
	85	+ this.endCase = endCase;
	86	+ }
	87	+
77	88	public List<String> getServiceList() {
78	89	return serviceList;
79	90	}
80	91
...	...	@@ -138,13 +149,11 @@
138	149	this.pregnantCertificateTypeId = pregnantCertificateTypeId;
139	150	}
140	151
141		- public String getSourceId()
142		- {
	152	+ public String getSourceId() {
143	153	return sourceId;
144	154	}
145	155
146		- public void setSourceId(String sourceId)
147		- {
	156	+ public void setSourceId(String sourceId) {
148	157	this.sourceId = sourceId;
149	158	}
150	159