jiangjiazhi / regional-platform

Commit 87f6738276ffb5366b61c4f764b783921f70e270

Authored by wtt over 4 years ago

Exists in master and in 6 other branches

update

Showing 6 changed files with 289 additions and 2 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyHighRiskBabyModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyHighRiskBabyRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyHighRiskBabyResult.java

...	...	@@ -19,6 +19,21 @@
19	19	private static final long serialVersionUID = SerialIdEnum.BabyHighRiskBabyModel.getCid();
20	20
21	21	/新增字段/
	22	+ // 纠正月龄\|\|纠正胎龄
	23	+ private String correctAge;
	24	+ //体重评价
	25	+ private String weightEvaluate;
	26	+ //身长评价
	27	+ private String heightEvaluate;
	28	+ //头围评价
	29	+ private String headEvaluate;
	30	+ //身长评价标准值
	31	+ private String heightEvaluateStandard;
	32	+ //头围评价标准值
	33	+ private String headEvaluateStandard;
	34	+ //体重评价标准值
	35	+ private String weightEvaluateStandard;
	36	+
22	37	//身长别体重
23	38	private String heightWeight;
24	39	//前囟{闭合、未闭合、未闭合尺寸x-y}
...	...	@@ -787,6 +802,66 @@
787	802
788	803	public void setYhipJoint(String yhipJoint) {
789	804	this.yhipJoint = yhipJoint;
	805	+ }
	806	+
	807	+ public static long getSerialVersionUID() {
	808	+ return serialVersionUID;
	809	+ }
	810	+
	811	+ public String getCorrectAge() {
	812	+ return correctAge;
	813	+ }
	814	+
	815	+ public void setCorrectAge(String correctAge) {
	816	+ this.correctAge = correctAge;
	817	+ }
	818	+
	819	+ public String getWeightEvaluate() {
	820	+ return weightEvaluate;
	821	+ }
	822	+
	823	+ public void setWeightEvaluate(String weightEvaluate) {
	824	+ this.weightEvaluate = weightEvaluate;
	825	+ }
	826	+
	827	+ public String getHeightEvaluate() {
	828	+ return heightEvaluate;
	829	+ }
	830	+
	831	+ public void setHeightEvaluate(String heightEvaluate) {
	832	+ this.heightEvaluate = heightEvaluate;
	833	+ }
	834	+
	835	+ public String getHeadEvaluate() {
	836	+ return headEvaluate;
	837	+ }
	838	+
	839	+ public void setHeadEvaluate(String headEvaluate) {
	840	+ this.headEvaluate = headEvaluate;
	841	+ }
	842	+
	843	+ public String getHeightEvaluateStandard() {
	844	+ return heightEvaluateStandard;
	845	+ }
	846	+
	847	+ public void setHeightEvaluateStandard(String heightEvaluateStandard) {
	848	+ this.heightEvaluateStandard = heightEvaluateStandard;
	849	+ }
	850	+
	851	+ public String getHeadEvaluateStandard() {
	852	+ return headEvaluateStandard;
	853	+ }
	854	+
	855	+ public void setHeadEvaluateStandard(String headEvaluateStandard) {
	856	+ this.headEvaluateStandard = headEvaluateStandard;
	857	+ }
	858	+
	859	+ public String getWeightEvaluateStandard() {
	860	+ return weightEvaluateStandard;
	861	+ }
	862	+
	863	+ public void setWeightEvaluateStandard(String weightEvaluateStandard) {
	864	+ this.weightEvaluateStandard = weightEvaluateStandard;
790	865	}
791	866	}

...	...	@@ -92,6 +92,14 @@
92	92	if(StringUtils.isEmpty(babyModel.getMname())){
93	93	model.setMname(request.getMname());
94	94	}
	95	+ model.setCorrectAge(request.getCorrectAge());
	96	+ model.setWeightEvaluate(request.getWeightEvaluate());
	97	+ model.setHeightEvaluate(request.getHeightEvaluate());
	98	+ model.setHeadEvaluate(request.getHeadEvaluate());
	99	+ model.setHeightEvaluateStandard(request.getHeightEvaluateStandard());
	100	+ model.setHeadEvaluateStandard(request.getHeadEvaluateStandard());
	101	+ model.setWeightEvaluateStandard(request.getWeightEvaluateStandard());
	102	+
95	103	model.setHeightWeight(request.getHeightWeight());
96	104	model.setBregma(request.getBregma());
97	105	model.setMs(request.getMs());
...	...	@@ -242,6 +250,17 @@
242	250	BabyHighRiskBabyModel babyHighRiskBabyModel = babyHighRiskBabyService.queryById(id);
243	251	BabyHighRiskBabyResult highRiskBabyResult = new BabyHighRiskBabyResult();
244	252	highRiskBabyResult.convertToResult(babyHighRiskBabyModel);
	253	+ if(StringUtils.isEmpty(babyHighRiskBabyModel.getGmdz())
	254	+ && StringUtils.isEmpty(babyHighRiskBabyModel.getGmdz())
	255	+ && StringUtils.isEmpty(babyHighRiskBabyModel.getXhdb())
	256	+ && StringUtils.isEmpty(babyHighRiskBabyModel.getXzcc())
	257	+ && StringUtils.isEmpty(babyHighRiskBabyModel.getTlcc())
	258	+ && StringUtils.isEmpty(babyHighRiskBabyModel.getTlhc())
	259	+ && StringUtils.isEmpty(babyHighRiskBabyModel.getZhipJoint())
	260	+ && StringUtils.isEmpty(babyHighRiskBabyModel.getYhipJoint())
	261	+ && babyHighRiskBabyModel.getNdt()==null ){
	262	+ highRiskBabyResult.setFzjcState("1");
	263	+ }
245	264
246	265	String bregma = "";
247	266	String bregmaValue = "";

...	...	@@ -15,6 +15,8 @@
15	15
16	16	//预产期避免前端误传报错
17	17	private String yChanQi;
	18	+ //分娩方式 shun 顺产 pao剖宫产高危儿回显使用
	19	+ private String fmfs;
18	20
19	21	//幼儿园名称,使用基础配置
20	22	private String yeymcId;
...	...	@@ -1433,6 +1435,14 @@
1433	1435
1434	1436	public void setVipEndTime(String vipEndTime) {
1435	1437	this.vipEndTime = vipEndTime;
	1438	+ }
	1439	+
	1440	+ public String getFmfs() {
	1441	+ return fmfs;
	1442	+ }
	1443	+
	1444	+ public void setFmfs(String fmfs) {
	1445	+ this.fmfs = fmfs;
1436	1446	}
1437	1447	}

...	...	@@ -15,6 +15,23 @@
15	15	*/
16	16	public class BabyHighRiskBabyRequest {
17	17	/新增字段/
	18	+
	19	+ // 纠正月龄\|\|纠正胎龄
	20	+ private String correctAge;
	21	+ //体重评价
	22	+ private String weightEvaluate;
	23	+ //身长评价
	24	+ private String heightEvaluate;
	25	+ //头围评价
	26	+ private String headEvaluate;
	27	+ //身长评价标准值
	28	+ private String heightEvaluateStandard;
	29	+ //头围评价标准值
	30	+ private String headEvaluateStandard;
	31	+ //体重评价标准值
	32	+ private String weightEvaluateStandard;
	33	+
	34	+
18	35	//身长别体重
19	36	private String heightWeight;
20	37	/*
...	...	@@ -814,6 +831,62 @@
814	831
815	832	public void setYhipJoint(String yhipJoint) {
816	833	this.yhipJoint = yhipJoint;
	834	+ }
	835	+
	836	+ public String getCorrectAge() {
	837	+ return correctAge;
	838	+ }
	839	+
	840	+ public void setCorrectAge(String correctAge) {
	841	+ this.correctAge = correctAge;
	842	+ }
	843	+
	844	+ public String getWeightEvaluate() {
	845	+ return weightEvaluate;
	846	+ }
	847	+
	848	+ public void setWeightEvaluate(String weightEvaluate) {
	849	+ this.weightEvaluate = weightEvaluate;
	850	+ }
	851	+
	852	+ public String getHeightEvaluate() {
	853	+ return heightEvaluate;
	854	+ }
	855	+
	856	+ public void setHeightEvaluate(String heightEvaluate) {
	857	+ this.heightEvaluate = heightEvaluate;
	858	+ }
	859	+
	860	+ public String getHeadEvaluate() {
	861	+ return headEvaluate;
	862	+ }
	863	+
	864	+ public void setHeadEvaluate(String headEvaluate) {
	865	+ this.headEvaluate = headEvaluate;
	866	+ }
	867	+
	868	+ public String getHeightEvaluateStandard() {
	869	+ return heightEvaluateStandard;
	870	+ }
	871	+
	872	+ public void setHeightEvaluateStandard(String heightEvaluateStandard) {
	873	+ this.heightEvaluateStandard = heightEvaluateStandard;
	874	+ }
	875	+
	876	+ public String getHeadEvaluateStandard() {
	877	+ return headEvaluateStandard;
	878	+ }
	879	+
	880	+ public void setHeadEvaluateStandard(String headEvaluateStandard) {
	881	+ this.headEvaluateStandard = headEvaluateStandard;
	882	+ }
	883	+
	884	+ public String getWeightEvaluateStandard() {
	885	+ return weightEvaluateStandard;
	886	+ }
	887	+
	888	+ public void setWeightEvaluateStandard(String weightEvaluateStandard) {
	889	+ this.weightEvaluateStandard = weightEvaluateStandard;
817	890	}
818	891	}

...	...	@@ -11,7 +11,10 @@
11	11
12	12	//预产期
13	13	private String yChanQi;
	14	+ //分娩方式
	15	+ private String dueType;
14	16
	17	+
15	18	private String yeymcId;//幼儿园名称,使用基础配置
16	19	private Map yeymcIdMap;//幼儿园名称,使用基础配置
17	20
...	...	@@ -164,8 +167,8 @@
164	167
165	168	//预产期
166	169	private String dueDate;
167		- //分娩方式
168		- private String dueType;
	170	+ //分娩方式 shun 顺产 pao剖宫产高危儿回显使用
	171	+ private String fmfs;
169	172	//胎数
170	173	private String fetusCount;
171	174	//产次
...	...	@@ -1387,5 +1390,25 @@
1387	1390	public void setmHighRiskReason2(List mHighRiskReason2) {
1388	1391	this.mHighRiskReason2 = mHighRiskReason2;
1389	1392	}
	1393	+
	1394	+ /*
	1395	+ <select ng-model="formData.dueType" ng-options="item.id as item.name for item in FMFS"
	1396	+ class="fgl_five_Input100 ng-pristine ng-untouched ng-valid"><option value="" class="">--请选择--</option>
	1397	+ <option value="0" label="顺产">顺产</option>
	1398	+ <option value="1" label="剖宫产">剖宫产</option>
	1399	+ <option value="2" label="流产">流产</option>
	1400	+ <option value="3" label="引产">引产</option></select>
	1401	+ shun 顺产 pao剖宫产
	1402	+ */
	1403	+ public String getFmfs() {
	1404	+ if ("0".equals(dueType)){
	1405	+ fmfs = "shun";
	1406	+ }else if("1".equals(dueType)){
	1407	+ fmfs = "pao";
	1408	+ }
	1409	+ return fmfs;
	1410	+ }
	1411	+
	1412	+
1390	1413	}

...	...	@@ -12,6 +12,23 @@
12	12	public class BabyHighRiskBabyResult implements IBasicResultConvert <BabyHighRiskBabyResult, BabyHighRiskBabyModel> {
13	13
14	14	/新增字段/
	15	+ // 纠正月龄\|\|纠正胎龄
	16	+ private String correctAge;
	17	+ //体重评价
	18	+ private String weightEvaluate;
	19	+ //身长评价
	20	+ private String heightEvaluate;
	21	+ //头围评价
	22	+ private String headEvaluate;
	23	+ //身长评价标准值
	24	+ private String heightEvaluateStandard;
	25	+ //头围评价标准值
	26	+ private String headEvaluateStandard;
	27	+ //体重评价标准值
	28	+ private String weightEvaluateStandard;
	29	+ //辅助检查状态 1 没有辅助检查
	30	+ private String fzjcState;
	31	+
15	32	//身长别体重
16	33	private String heightWeight;
17	34	//前囟{闭合、未闭合、未闭合尺寸x-y}
18	35
19	36
...	...	@@ -247,8 +264,70 @@
247	264	this.hospitalName = hospitalName;
248	265	}
249	266
	267	+ public String getCorrectAge() {
	268	+ return correctAge;
	269	+ }
250	270
	271	+ public void setCorrectAge(String correctAge) {
	272	+ this.correctAge = correctAge;
	273	+ }
251	274
	275	+ public String getWeightEvaluate() {
	276	+ return weightEvaluate;
	277	+ }
	278	+
	279	+ public void setWeightEvaluate(String weightEvaluate) {
	280	+ this.weightEvaluate = weightEvaluate;
	281	+ }
	282	+
	283	+ public String getHeightEvaluate() {
	284	+ return heightEvaluate;
	285	+ }
	286	+
	287	+ public void setHeightEvaluate(String heightEvaluate) {
	288	+ this.heightEvaluate = heightEvaluate;
	289	+ }
	290	+
	291	+ public String getHeadEvaluate() {
	292	+ return headEvaluate;
	293	+ }
	294	+
	295	+ public void setHeadEvaluate(String headEvaluate) {
	296	+ this.headEvaluate = headEvaluate;
	297	+ }
	298	+
	299	+ public String getHeightEvaluateStandard() {
	300	+ return heightEvaluateStandard;
	301	+ }
	302	+
	303	+ public void setHeightEvaluateStandard(String heightEvaluateStandard) {
	304	+ this.heightEvaluateStandard = heightEvaluateStandard;
	305	+ }
	306	+
	307	+ public String getHeadEvaluateStandard() {
	308	+ return headEvaluateStandard;
	309	+ }
	310	+
	311	+ public void setHeadEvaluateStandard(String headEvaluateStandard) {
	312	+ this.headEvaluateStandard = headEvaluateStandard;
	313	+ }
	314	+
	315	+ public String getWeightEvaluateStandard() {
	316	+ return weightEvaluateStandard;
	317	+ }
	318	+
	319	+ public void setWeightEvaluateStandard(String weightEvaluateStandard) {
	320	+ this.weightEvaluateStandard = weightEvaluateStandard;
	321	+ }
	322	+
	323	+ public String getFzjcState() {
	324	+ return fzjcState;
	325	+ }
	326	+
	327	+ public void setFzjcState(String fzjcState) {
	328	+ this.fzjcState = fzjcState;
	329	+ }
	330	+
252	331	public String getMname() {
253	332	return mname;
254	333	}
...	...	@@ -847,6 +926,14 @@
847	926	public BabyHighRiskBabyResult convertToResult(BabyHighRiskBabyModel destModel) {
848	927
849	928	try {
	929	+ setCorrectAge(destModel.getCorrectAge());
	930	+ setWeightEvaluate(destModel.getWeightEvaluate());
	931	+ setHeightEvaluate(destModel.getHeightEvaluate());
	932	+ setHeadEvaluate(destModel.getHeadEvaluate());
	933	+ setHeightEvaluateStandard(destModel.getHeightEvaluateStandard());
	934	+ setHeadEvaluateStandard(destModel.getHeadEvaluateStandard());
	935	+ setWeightEvaluateStandard(destModel.getWeightEvaluateStandard());
	936	+
850	937	setHeightWeight(destModel.getHeightWeight());
851	938	setMs(destModel.getMs());
852	939	setPf(destModel.getPf());