jiangjiazhi / regional-platform

Commit 39946cd6b5be884ec475373eb71b4709648cd2a7

Authored by wangbo almost 6 years ago

Exists in master and in 6 other branches

威海字段打印添加

Showing 4 changed files with 126 additions and 32 deletions

platform-common/src/main/java/com/lyms/platform/common/enums/PostpartumRecordsEnums.java
platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.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/request/MatDeliverAddRequest.java

...	...	@@ -4,25 +4,29 @@
4	4	* Created by Administrator on 2019/1/14.
5	5	*/
6	6	public enum PostpartumRecordsEnums {
7		- O("给缩宫素20U入余液体静滴，行心电监护，按摩子宫。","2"),
8		- O1("新生儿置母亲腹部进行全裸皮肤接触。","3"),
9		- O2("观察新生儿肤色红润，正在吸吮。","4"),
10		- O3("按摩子宫质硬。","5"),
11		- O4("向病人交待伤口注意事项，同时指导产妇与家属学习母乳喂养技巧。","6"),
12		- O5("已母婴皮肤接触并吸吮90分钟。","7"),
13		- O6("内诊、肛查无异常，遵医嘱停液体，母婴安返病区。","8");
	7	+ O("给缩宫素20U入余液体静滴，行心电监护，按摩子宫。", "2"),
	8	+ O1("新生儿置母亲腹部进行全裸皮肤接触。", "3"),
	9	+ O2("观察新生儿肤色红润，正在吸吮。", "4"),
	10	+ O3("按摩子宫质硬。", "5"),
	11	+ O4("向病人交待伤口注意事项，同时指导产妇与家属学习母乳喂养技巧。", "6"),
	12	+ O5("已母婴皮肤接触并吸吮90分钟。", "7"),
	13	+ O6("内诊、肛查无异常，遵医嘱停液体，母婴安返病区。", "8"),
	14	+ O7("向产妇交代产后注意事项，，同时指导产妇母乳喂养技巧，宣教母乳喂养知识。", "9"),
	15	+ O8("按摩子宫质硬，内诊无异常，累计出血量300ml。", "10"),
	16	+ O9("停心电监护。", "11"),
	17	+ O10("停止皮肤接触及早吸吮。", "12");
14	18
15		- private PostpartumRecordsEnums(String name, String id){
16		- this.id=id;
17		- this.name=name;
	19	+ private PostpartumRecordsEnums(String name, String id) {
	20	+ this.id = id;
	21	+ this.name = name;
18	22	}
19	23
20		- public static String getTitles(String id){
21		- if (id==null){
	24	+ public static String getTitles(String id) {
	25	+ if (id == null) {
22	26	return "";
23	27	}
24		- for (CfEnums cfEnums:CfEnums.values()){
25		- if (id.equals(cfEnums.getId())){
	28	+ for (CfEnums cfEnums : CfEnums.values()) {
	29	+ if (id.equals(cfEnums.getId())) {
26	30	return cfEnums.getName();
27	31	}
28	32	}

...	...	@@ -120,6 +120,10 @@
120	120	private String fsHospital;
121	121	//接生医生
122	122	private String deliverDoctor;
	123	+
	124	+ //督导医生
	125	+ private String supervisorDoctor;
	126	+
123	127	private Integer yn;
124	128	private Date created;
125	129	private Date modified;
...	...	@@ -167,6 +171,14 @@
167	171
168	172	private List<Integer> fmChildTimes;
169	173
	174	+ public String getSupervisorDoctor() {
	175	+ return supervisorDoctor;
	176	+ }
	177	+
	178	+ public void setSupervisorDoctor(String supervisorDoctor) {
	179	+ this.supervisorDoctor = supervisorDoctor;
	180	+ }
	181	+
170	182	public Integer getFmAge() {
171	183	return fmAge;
172	184	}
173	185
...	...	@@ -538,10 +550,31 @@
538	550	private String cjfy;//刺激反应
539	551	private String zl;//张力
540	552
	553	+ /*******201905计划威海妇幼新增字段*******/
	554	+
	555	+ private String babyQX; //新生儿去向 1.病房 2.NICU 3.转院 4.其他
	556	+ private String otherInfo;
	557	+
541	558	public Baby() {
542	559
543	560	}
544	561
	562	+ public String getBabyQX() {
	563	+ return babyQX;
	564	+ }
	565	+
	566	+ public void setBabyQX(String babyQX) {
	567	+ this.babyQX = babyQX;
	568	+ }
	569	+
	570	+ public String getOtherInfo() {
	571	+ return otherInfo;
	572	+ }
	573	+
	574	+ public void setOtherInfo(String otherInfo) {
	575	+ this.otherInfo = otherInfo;
	576	+ }
	577	+
545	578	public String getHx() {
546	579	return hx;
547	580	}
...	...	@@ -1901,7 +1934,7 @@
1901	1934
1902	1935	/*****威海再再次新增字段（201905月计划中）*****/
1903	1936	private String comment;//指正任意输入
1904		- private String AFV;// 羊水量 ml
	1937	+ private String afv;// 羊水量 ml
1905	1938	private Date parturientTime; //临产时间
1906	1939	private String vaginaBloodAmount;//阴道出血量
1907	1940
1908	1941
...	...	@@ -1913,12 +1946,12 @@
1913	1946	this.comment = comment;
1914	1947	}
1915	1948
1916		- public String getAFV() {
1917		- return AFV;
	1949	+ public String getAfv() {
	1950	+ return afv;
1918	1951	}
1919	1952
1920		- public void setAFV(String AFV) {
1921		- this.AFV = AFV;
	1953	+ public void setAfv(String afv) {
	1954	+ this.afv = afv;
1922	1955	}
1923	1956
1924	1957	public Date getParturientTime() {

...	...	@@ -2768,8 +2768,16 @@
2768	2768	map.put("zypbfm", data.getZypbfm());
2769	2769	map.put("totalOneCxl", data.getTotalOneCxl());
2770	2770	map.put("xsebz", data.getXsebz());
	2771	+ /* private String babyQX; //新生儿去向 1.病房 2.NICU 3.转院 4.其他
	2772	+ private String otherInfo;*/
2771	2773
	2774	+ /*****威海再再次新增字段（201905月计划中）*****/
2772	2775
	2776	+ map.put("comment", data.getComment());
	2777	+ map.put("afv", data.getAfv());
	2778	+ map.put("parturientTime", DateUtil.getyyyy_MM_dd_hms(data.getParturientTime()));
	2779	+
	2780	+
2773	2781	/* 产后生理 */
2774	2782	map.put("maternalInfo", data.getMaternalInfo() == null ? "" : CfEnums.getTitle(data.getMaternalInfo()));
2775	2783	map.put("deathCause", com.lyms.platform.common.utils.StringUtils.isEmpty(data.getDeathCause()) ? "--" : DeathCauseEnums.getName(data.getDeathCause()));
...	...	@@ -2823,7 +2831,6 @@
2823	2831	map.put("tHloseBloodL", UnitUtils.unitSplice(data.gettHloseBloodL(), UnitConstants.ML));
2824	2832	map.put("rHloseBloodL", UnitUtils.unitSplice(data.getrHloseBloodL(), UnitConstants.ML));
2825	2833	map.put("sHloseBloodL", UnitUtils.unitSplice(data.getsHloseBloodL(), UnitConstants.ML));
2826		-
2827	2834	String loseBloodCause = "";
2828	2835	if (StringUtils.isNotEmpty(data.getLoseBloodCause())) {
2829	2836	String loseBloodCauseJson = data.getLoseBloodCause();
...	...	@@ -2878,7 +2885,6 @@
2878	2885	extMap.put("tpSizeList", sizeMap);
2879	2886	}
2880	2887	extMap.put("tpSize", tpSize);
2881		-
2882	2888	extMap.put("tpWeight", UnitUtils.unitSplice(temp.getTpWeight(), UnitConstants.G));
2883	2889	extMap.put("umbilicalCordLength", UnitUtils.unitSplice(temp.getUmbilicalCordLength(), UnitConstants.CM));
2884	2890
...	...	@@ -2968,8 +2974,11 @@
2968	2974	babyMap.put("jxTszh", temp.isJxTszh());
2969	2975	babyMap.put("jxXtx", temp.isJxXtx());
2970	2976	babyMap.put("jxOther", temp.getJxOther());
2971		-
2972		-
	2977	+ /*威海市妇幼加字段*/
	2978	+ babyMap.put("babyQX", temp.getBabyQX());
	2979	+ if ("4".equals(temp.getBabyQX())) {
	2980	+ babyMap.put("otherInfo", temp.getOtherInfo());
	2981	+ }
2973	2982	babyMap.put("babyId", temp.getId());
2974	2983	babyMap.put("dueTime", temp.getDueTime());
2975	2984	babyMap.put("pregnancyOut", temp.getPregnancyOut() == null ? "" : RenShenJieJuEnums.getTitle(temp.getPregnancyOut()));
...	...	@@ -5063,6 +5072,24 @@
5063	5072
5064	5073	//接生者
5065	5074	map.put("deliverDoctor", deliverDoctor);
	5075	+
	5076	+
	5077	+ //督导医生
	5078	+ String supervisorDoctor = "";
	5079	+
	5080	+ if (StringUtils.isNotEmpty(data.getSupervisorDoctor())) {
	5081	+ if (com.lyms.platform.common.utils.StringUtils.isNum(data.getSupervisorDoctor())) {
	5082	+ Users users = usersService.getUsers(Integer.parseInt(data.getSupervisorDoctor()));
	5083	+ if (users != null && users.getYn() == YnEnums.YES.getId()) {
	5084	+ supervisorDoctor = users.getName();
	5085	+ }
	5086	+ } else {
	5087	+ supervisorDoctor = data.getSupervisorDoctor();
	5088	+ }
	5089	+ }
	5090	+
	5091	+ //督导医生
	5092	+ map.put("supervisorDoctor", supervisorDoctor);
5066	5093
5067	5094
5068	5095	String qfDate = DateUtil.getYmd(new Date());

...	...	@@ -95,6 +95,8 @@
95	95	private String fmHospital;
96	96	//接生医生
97	97	private String deliverDoctor;
	98	+ //督导医生
	99	+ private String supervisorDoctor;
98	100
99	101	private String couponCode;
100	102
...	...	@@ -103,6 +105,14 @@
103	105
104	106	private YunBookbuildingAddRequest patient;
105	107
	108	+ public String getSupervisorDoctor() {
	109	+ return supervisorDoctor;
	110	+ }
	111	+
	112	+ public void setSupervisorDoctor(String supervisorDoctor) {
	113	+ this.supervisorDoctor = supervisorDoctor;
	114	+ }
	115	+
106	116	public Map getHandDueWeek() {
107	117	return handDueWeek;
108	118	}
...	...	@@ -363,7 +373,7 @@
363	373
364	374	/*****威海再再次新增字段（201905月计划中）*****/
365	375	private String comment;//指正任意输入
366		- private String AFV;// 羊水量 ml
	376	+ private String afv;// 羊水量 ml
367	377	private Date parturientTime; //临产时间
368	378	private String vaginaBloodAmount;//阴道出血量
369	379
...	...	@@ -412,6 +422,8 @@
412	422	maternalDeliverModel.setFmHospital(fmHospital);
413	423	maternalDeliverModel.setDeathCauseText(deathCauseText);
414	424	maternalDeliverModel.setDeliverDoctor(deliverDoctor);
	425	+ maternalDeliverModel.setSupervisorDoctor(supervisorDoctor);
	426	+
415	427	maternalDeliverModel.setId(id);
416	428
417	429	//威海妇幼新增字段
...	...	@@ -459,7 +471,7 @@
459	471	maternalDeliverModel.setTotalOneCxl(totalOneCxl);
460	472	maternalDeliverModel.setXsebz(xsebz);
461	473	/*****威海再再次新增字段（201905月计划中）*****/
462		- maternalDeliverModel.setAFV(AFV);
	474	+ maternalDeliverModel.setAfv(afv);
463	475	maternalDeliverModel.setComment(comment);
464	476	maternalDeliverModel.setParturientTime(parturientTime);
465	477	maternalDeliverModel.setVaginaBloodAmount(vaginaBloodAmount);
466	478
...	...	@@ -898,12 +910,12 @@
898	910	this.comment = comment;
899	911	}
900	912
901		- public String getAFV() {
902		- return AFV;
	913	+ public String getAfv() {
	914	+ return afv;
903	915	}
904	916
905		- public void setAFV(String AFV) {
906		- this.AFV = AFV;
	917	+ public void setAfv(String afv) {
	918	+ this.afv = afv;
907	919	}
908	920
909	921	public Date getParturientTime() {
910	922
...	...	@@ -1287,8 +1299,24 @@
1287	1299
1288	1300	/*******201905计划威海妇幼新增字段*******/
1289	1301	private String babyQX; //新生儿去向 1.病房 2.NICU 3.转院 4.其他
1290		- private String other;
	1302	+ private String otherInfo;//其他详细说明
1291	1303
	1304	+ public String getBabyQX() {
	1305	+ return babyQX;
	1306	+ }
	1307	+
	1308	+ public void setBabyQX(String babyQX) {
	1309	+ this.babyQX = babyQX;
	1310	+ }
	1311	+
	1312	+ public String getOtherInfo() {
	1313	+ return otherInfo;
	1314	+ }
	1315	+
	1316	+ public void setOtherInfo(String otherInfo) {
	1317	+ this.otherInfo = otherInfo;
	1318	+ }
	1319	+
1292	1320	@Override
1293	1321	public MaternalDeliverModel.Baby convertToDataModel() {
1294	1322	MaternalDeliverModel.Baby baby = new MaternalDeliverModel.Baby();
...	...	@@ -1407,7 +1435,9 @@
1407	1435	baby.setYs(ys);
1408	1436	baby.setCjfy(cjfy);
1409	1437	baby.setZl(zl);
1410		-
	1438	+ /*******201905计划威海妇幼新增字段*******/
	1439	+ baby.setBabyQX(babyQX);
	1440	+ baby.setOtherInfo(otherInfo);
1411	1441	return baby;
1412	1442	}
1413	1443