jiangjiazhi / regional-platform

Commit 8a80ec36279f7bb2f131f77dfb04c52492d057ea

Authored by wangbo over 6 years ago

Exists in master and in 6 other branches

威海字段回显问题解决

Showing 4 changed files with 137 additions and 40 deletions

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/facade/MatDeliverFacade.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/MaternalDeliverResult.java

...	...	@@ -131,18 +131,20 @@
131	131	//儿童体检后更新下次预约时间和是否高危在基础数据表里面
132	132	BabyModel bm = new BabyModel();
133	133	//添加结案字段
134		- bm.setEndCase(request.getEndCase());
135		- if (1 == request.getEndCase()) {
136		- bm.setOutcome(request.getOutcome());
137		- bm.setEndCaseTime(new Date());
138		- }
139		- bm.setModified(new Date());
140		- if (request.getHighRisk() == null) {
141		- bm.setLastHighRisk(0);
142		- } else {
143		- bm.setLastHighRisk(request.getHighRisk());
	134	+ if (null != request.getEndCase()) {
	135	+ bm.setEndCase(request.getEndCase());
	136	+ if (1 == request.getEndCase()) {
	137	+ bm.setOutcome(request.getOutcome());
	138	+ bm.setEndCaseTime(new Date());
	139	+ }
	140	+ bm.setModified(new Date());
	141	+ if (request.getHighRisk() == null) {
	142	+ bm.setLastHighRisk(0);
	143	+ } else {
	144	+ bm.setLastHighRisk(request.getHighRisk());
144	145
145		- bm.setHighRiskInfo(request.getHighRiskInfo());
	146	+ bm.setHighRiskInfo(request.getHighRiskInfo());
	147	+ }
146	148	}
147	149	//高危儿因素添加
148	150	if (request.getWeakSon() == null) {

...	...	@@ -1428,6 +1428,24 @@
1428	1428
1429	1429
1430	1430	maternalDeliverResult.setDeliverDoctor(map);
	1431	+ //督导医生
	1432	+ String supervisorDoctorId = deliverModel.getSupervisorDoctor();
	1433	+ Map<String, String> supervisorMap = new HashMap<>();
	1434	+ try {
	1435	+ Users users = usersService.getUsers(Integer.valueOf(supervisorDoctorId));
	1436	+
	1437	+ if (null != users) {
	1438	+ supervisorMap.put("id", users.getId() + "");
	1439	+ supervisorMap.put("name", users.getName());
	1440	+ }
	1441	+ } catch (Exception e) {
	1442	+ supervisorMap.put("id", "-1");
	1443	+ supervisorMap.put("name", doctorId);
	1444	+ }
	1445	+
	1446	+
	1447	+ maternalDeliverResult.setSupervisorDoctor(supervisorMap);
	1448	+
1431	1449	//获取新生儿信息
1432	1450	List<MaternalDeliverModel.Baby> babyIdList = deliverModel.getBaby();
1433	1451	List babyList = new ArrayList();
...	...	@@ -1828,8 +1846,7 @@
1828	1846
1829	1847	matDeliverQuery.setFmHospitalList(hospitalList);
1830	1848	matDeliverQuery.setFsHospital(hospitalId);
1831		- if (StringUtils.isNotEmpty(matdeliverFollowRequest.getFsHospitalId()))
1832		- {
	1849	+ if (StringUtils.isNotEmpty(matdeliverFollowRequest.getFsHospitalId())) {
1833	1850	matDeliverQuery.setFsHospitalId(matdeliverFollowRequest.getFsHospitalId());
1834	1851	}
1835	1852	matDeliverQuery.setContactResult(matdeliverFollowRequest.getContactResult());

...	...	@@ -374,7 +374,7 @@
374	374	/*****威海再再次新增字段（201905月计划中）*****/
375	375	private String comment;//指正任意输入
376	376	private String afv;// 羊水量 ml
377		- private Date parturientTime; //临产时间
	377	+ private String parturientTime; //临产时间
378	378	private String vaginaBloodAmount;//阴道出血量
379	379
380	380
...	...	@@ -473,7 +473,7 @@
473	473	/*****威海再再次新增字段（201905月计划中）*****/
474	474	maternalDeliverModel.setAfv(afv);
475	475	maternalDeliverModel.setComment(comment);
476		- maternalDeliverModel.setParturientTime(parturientTime);
	476	+ maternalDeliverModel.setParturientTime(DateUtil.parseYMDHM(parturientTime));
477	477	maternalDeliverModel.setVaginaBloodAmount(vaginaBloodAmount);
478	478
479	479
480	480
...	...	@@ -918,11 +918,11 @@
918	918	this.afv = afv;
919	919	}
920	920
921		- public Date getParturientTime() {
	921	+ public String getParturientTime() {
922	922	return parturientTime;
923	923	}
924	924
925		- public void setParturientTime(Date parturientTime) {
	925	+ public void setParturientTime(String parturientTime) {
926	926	this.parturientTime = parturientTime;
927	927	}
928	928
...	...	@@ -974,7 +974,7 @@
974	974	*/
975	975	private String fetalPositionSelect;
976	976	/**
977		- * 衔接选项 1-已测 2-未测
	977	+ * 衔接选项 1-已测 2-未测
978	978	*/
979	979	private String joinSelect;
980	980

...	...	@@ -6,6 +6,7 @@
6	6	import org.codehaus.jackson.map.ObjectMapper;
7	7
8	8	import java.io.IOException;
	9	+import java.util.Date;
9	10	import java.util.List;
10	11	import java.util.Map;
11	12
...	...	@@ -14,7 +15,7 @@
14	15	* <p>
15	16	* Created by Administrator on 2016/6/16 0016.
16	17	*/
17		-public class MaternalDeliverResult {
	18	+public class MaternalDeliverResult {
18	19
19	20	private String id;
20	21	//产妇id
...	...	@@ -22,7 +23,7 @@
22	23	//分娩时间
23	24	private String dueDate;
24	25	//手工分娩孕周
25		- private Map<String,Object> handDueWeek;
	26	+ private Map<String, Object> handDueWeek;
26	27	//分娩孕周
27	28	private String dueWeek;
28	29	// 产次
...	...	@@ -42,7 +43,7 @@
42	43	//手术原因
43	44	private String operationCause;
44	45	//产程 h 小时 m 分
45		- private Map<String,Map> prodprocess;
	46	+ private Map<String, Map> prodprocess;
46	47	//总产程
47	48	private Map totalprocess;
48	49	//会阴情况
49	50
50	51
...	...	@@ -81,10 +82,21 @@
81	82
82	83	private List<Baby> babies;
83	84	//分娩医院
84		- private Map<String,String> fmHospital;
	85	+ private Map<String, String> fmHospital;
85	86	//接生医生
86		- private Map<String,String> deliverDoctor;
	87	+ private Map<String, String> deliverDoctor;
87	88
	89	+ //督导医生
	90	+ private Map<String, String> supervisorDoctor;
	91	+
	92	+ public Map<String, String> getSupervisorDoctor() {
	93	+ return supervisorDoctor;
	94	+ }
	95	+
	96	+ public void setSupervisorDoctor(Map<String, String> supervisorDoctor) {
	97	+ this.supervisorDoctor = supervisorDoctor;
	98	+ }
	99	+
88	100	public String getDeathCauseText() {
89	101	return deathCauseText;
90	102	}
91	103
...	...	@@ -128,11 +140,11 @@
128	140	/*****威海再次新增字段（12月计划中）*****/
129	141	private Integer gravidity;//孕次
130	142	private String department;//科室(1：产一；2：产二)
131		- private Map<String,Object> myzd;//母婴阻断
	143	+ private Map<String, Object> myzd;//母婴阻断
132	144	private String analMode;//镇痛方式（1：无痛；2：无痛+陪娩；3：导乐+陪娩；4：陪娩）
133	145	private String hyCondition;//会阴情况（1：Ⅰ度；2：Ⅱ度；3：Ⅲ度；4：侧切）
134	146	private String ssRecord;//手术记录
135		- private Map<String,Object> ssCount;//手术清点
	147	+ private Map<String, Object> ssCount;//手术清点
136	148	private String ssProcedure;//所施手术
137	149	private String pgcCxl;//剖宫产出血量
138	150	private String totalTwoCxl;//阴道分娩产后2小时总出血量
139	151
...	...	@@ -155,10 +167,49 @@
155	167	private String xsebz;//新生儿备注
156	168
157	169
	170	+ /*****威海再再次新增字段（201905月计划中）*****/
	171	+ private String comment;//指正任意输入
	172	+ private String afv;// 羊水量 ml
	173	+ private String parturientTime; //临产时间
	174	+ private String vaginaBloodAmount;//阴道出血量
	175	+
	176	+ public String getComment() {
	177	+ return comment;
	178	+ }
	179	+
	180	+ public void setComment(String comment) {
	181	+ this.comment = comment;
	182	+ }
	183	+
	184	+ public String getAfv() {
	185	+ return afv;
	186	+ }
	187	+
	188	+ public void setAfv(String afv) {
	189	+ this.afv = afv;
	190	+ }
	191	+
	192	+ public String getParturientTime() {
	193	+ return parturientTime;
	194	+ }
	195	+
	196	+ public void setParturientTime(String parturientTime) {
	197	+ this.parturientTime = parturientTime;
	198	+ }
	199	+
	200	+ public String getVaginaBloodAmount() {
	201	+ return vaginaBloodAmount;
	202	+ }
	203	+
	204	+ public void setVaginaBloodAmount(String vaginaBloodAmount) {
	205	+ this.vaginaBloodAmount = vaginaBloodAmount;
	206	+ }
	207	+
158	208	public String getYsqk() {
159	209	return ysqk;
160	210	}
161	211
	212	+
162	213	public void setYsqk(String ysqk) {
163	214	this.ysqk = ysqk;
164	215	}
165	216
...	...	@@ -315,11 +366,11 @@
315	366	this.department = department;
316	367	}
317	368
318		- public Map<String,Object> getMyzd() {
	369	+ public Map<String, Object> getMyzd() {
319	370	return myzd;
320	371	}
321	372
322		- public void setMyzd(Map<String,Object> myzd) {
	373	+ public void setMyzd(Map<String, Object> myzd) {
323	374	this.myzd = myzd;
324	375	}
325	376
326	377
...	...	@@ -545,10 +596,14 @@
545	596	setTotalOneCxl(destModel.getTotalOneCxl());
546	597	setXsebz(destModel.getXsebz());
547	598
	599	+ /*****威海再再次新增字段（201905月计划中）*****/
	600	+ setComment(destModel.getComment());
	601	+ setAfv(destModel.getAfv());
	602	+ setParturientTime(DateUtil.gety_m_dhm(destModel.getParturientTime()));
548	603	return this;
549	604	}
550	605
551		- public class Placenta{
	606	+ public class Placenta {
552	607	//心率
553	608	private double heartRate;
554	609	//胎方位
555	610
...	...	@@ -590,8 +645,9 @@
590	645	this.join = join;
591	646	}
592	647	}
593		- public class Baby{
594	648
	649	+ public class Baby {
	650	+
595	651	private String id;
596	652	//新生儿性别;
597	653	private String babyGender;
...	...	@@ -764,8 +820,15 @@
764	820	private String cjfy;//刺激反应
765	821	private String zl;//张力
766	822
767		- public Baby(){}//增加无参构造方法
768		- public Baby(MaternalDeliverModel.Baby babyModel){
	823	+ /*******201905计划威海妇幼新增字段*******/
	824	+ private String babyQX;
	825	+ private String otherInfo;
	826	+
	827	+
	828	+ public Baby() {
	829	+ }//增加无参构造方法
	830	+
	831	+ public Baby(MaternalDeliverModel.Baby babyModel) {
769	832	setId(babyModel.getId());
770	833	setBabyGender(babyModel.getBabyGender() + "");
771	834	setBabyWeight(babyModel.getBabyWeight());
...	...	@@ -876,7 +939,10 @@
876	939	setYs(babyModel.getYs());
877	940	setCjfy(babyModel.getCjfy());
878	941	setZl(babyModel.getZl());
879		-
	942	+ setBabyQX(babyModel.getBabyQX());
	943	+ if ("4".equals(babyModel.getBabyQX())) {
	944	+ setOtherInfo(babyModel.getOtherInfo());
	945	+ }
880	946	}
881	947
882	948	public String getHx() {
...	...	@@ -895,6 +961,22 @@
895	961	this.xt = xt;
896	962	}
897	963
	964	+ public String getBabyQX() {
	965	+ return babyQX;
	966	+ }
	967	+
	968	+ public void setBabyQX(String babyQX) {
	969	+ this.babyQX = babyQX;
	970	+ }
	971	+
	972	+ public String getOtherInfo() {
	973	+ return otherInfo;
	974	+ }
	975	+
	976	+ public void setOtherInfo(String otherInfo) {
	977	+ this.otherInfo = otherInfo;
	978	+ }
	979	+
898	980	public String getYs() {
899	981	return ys;
900	982	}
...	...	@@ -1742,7 +1824,6 @@
1742	1824	}
1743	1825
1744	1826
1745		-
1746	1827	public String getDeathCause() {
1747	1828	return deathCause;
1748	1829	}
...	...	@@ -1816,7 +1897,6 @@
1816	1897	}
1817	1898
1818	1899
1819		-
1820	1900	public String getNeedleNum() {
1821	1901	return needleNum;
1822	1902	}
...	...	@@ -1826,8 +1906,6 @@
1826	1906	}
1827	1907
1828	1908
1829		-
1830		-
1831	1909	public String getOperationCause() {
1832	1910	return operationCause;
1833	1911	}
...	...	@@ -1869,7 +1947,6 @@
1869	1947	}
1870	1948
1871	1949
1872		-
1873	1950	public String getPulse() {
1874	1951	return pulse;
1875	1952	}
1876	1953
1877	1954
...	...	@@ -1993,11 +2070,12 @@
1993	2070	public void setProdprocess(Map<String, Map> prodprocess) {
1994	2071	this.prodprocess = prodprocess;
1995	2072	}
1996		- public static void main(String[] args){
	2073	+
	2074	+ public static void main(String[] args) {
1997	2075	Map b =
1998		- (Map)JsonUtil.str2Obj("{\"one\":{\"h\":\"123\",\"m\":\"234\"},\"two\":{\"h\":\"123\",\"m\":\"234\"},\"three\":{\"h\":\"123\",\"m\":\"234\"}}", Map.class);
	2076	+ (Map) JsonUtil.str2Obj("{\"one\":{\"h\":\"123\",\"m\":\"234\"},\"two\":{\"h\":\"123\",\"m\":\"234\"},\"three\":{\"h\":\"123\",\"m\":\"234\"}}", Map.class);
1999	2077
2000		- ObjectMapper objectMapper = new ObjectMapper();
	2078	+ ObjectMapper objectMapper = new ObjectMapper();
2001	2079
2002	2080
2003	2081	Map acc = null;