jiangjiazhi / regional-platform

Commit d0dd4f277e8f80cdc6d8187a24d95e7c1ed8dfe1

Authored by changpengfei over 3 years ago

Exists in master and in 6 other branches

经皮胆血红素

Showing 5 changed files with 105 additions and 8 deletions

platform-biz-service/src/main/resources/mainOrm/master/MeasureDataInfoMapper.xml
platform-dal/src/main/java/com/lyms/platform/pojo/MeasureBabyInfoModel.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/facade/MeasureInfoFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MeasureBabyInfoRequest.java

...	...	@@ -329,12 +329,12 @@
329	329	</sql>
330	330
331	331	<insert id="addMeasureBabyDataInfo" parameterType="com.lyms.platform.pojo.MeasureBabyInfoModel">
332		- INSERT INTO measure_baby_info(
333		- value_one,value_two,value_three,value_type
334		- ,record_count,created,modified,today_count,remark_value,hospital_id,baby_id)
335		- VALUES (#{valueOne}
336		- ,#{valueTwo},#{valueThree},#{valueType},#{recordCount},#{created},#{modified},#{todayCount},#{remarkValue},#{hospitalId},#{babyId})
337		- </insert>
	332	+ INSERT INTO measure_baby_info(
	333	+ value_one,value_two,value_three,value_type
	334	+ ,record_count,created,modified,today_count,remark_value,hospital_id,baby_id,jing,pi,dan)
	335	+ VALUES (#{valueOne}
	336	+ ,#{valueTwo},#{valueThree},#{valueType},#{recordCount},#{created},#{modified},#{todayCount},#{remarkValue},#{hospitalId},#{babyId},#{jing},#{pi},#{dan})
	337	+ </insert>
338	338
339	339
340	340	<resultMap type="com.lyms.platform.pojo.MeasureBabyInfoModel" id="measureBabyDataInfoMap">
...	...	@@ -416,7 +416,7 @@
416	416
417	417	<select id="queryMeasureBabyInfoList" resultMap="measureBabyDataInfoMap">
418	418	SELECT id,value_one,value_two,value_three,value_type
419		- ,record_count,created,modified,today_count,remark_value,hospital_id,baby_id FROM measure_baby_info
	419	+ ,record_count,created,modified,today_count,remark_value,hospital_id,baby_id,jing,pi,dan FROM measure_baby_info
420	420	<include refid="queryMeasureBabyDataInfoCondition"/>
421	421	<include refid="orderAndLimit"/>
422	422	</select>
423	423
...	...	@@ -467,12 +467,21 @@
467	467	<if test="remarkValue != null and remarkValue != ''">
468	468	remark_value = #{remarkValue,jdbcType=VARCHAR},
469	469	</if>
	470	+ <if test="jing != null and jing != ''">
	471	+ jing = #{jing,jdbcType=VARCHAR},
	472	+ </if>
	473	+ <if test="pi != null and pi != ''">
	474	+ pi = #{pi,jdbcType=VARCHAR},
	475	+ </if>
	476	+ <if test="dan != null and dan != ''">
	477	+ dan = #{dan,jdbcType=VARCHAR},
	478	+ </if>
470	479	</set>
471	480	where id = #{id,jdbcType=INTEGER}
472	481	</update>
473	482
474	483	<select id="queryOneMeasureBaby" resultMap="measureBabyDataInfoMap">
475		- select baby_id,hospital_id,value_one,value_two,value_three from measure_baby_info
	484	+ select baby_id,hospital_id,value_one,value_two,value_three,jing,pi,dan from measure_baby_info
476	485	where
477	486	<if test="babyId !=null">
478	487	baby_id= #{babyId,jdbcType=VARCHAR}

...	...	@@ -32,6 +32,38 @@
32	32	//当天记录次数
33	33	private Integer todayCount;
34	34
	35	+ //经皮胆红素,start
	36	+ private String jing;
	37	+ private String pi;
	38	+ private String dan;
	39	+
	40	+ //经皮胆红素,end
	41	+
	42	+
	43	+ public String getJing() {
	44	+ return jing;
	45	+ }
	46	+
	47	+ public void setJing(String jing) {
	48	+ this.jing = jing;
	49	+ }
	50	+
	51	+ public String getPi() {
	52	+ return pi;
	53	+ }
	54	+
	55	+ public void setPi(String pi) {
	56	+ this.pi = pi;
	57	+ }
	58	+
	59	+ public String getDan() {
	60	+ return dan;
	61	+ }
	62	+
	63	+ public void setDan(String dan) {
	64	+ this.dan = dan;
	65	+ }
	66	+
35	67	public String getRemarkValue() {
36	68	return remarkValue;
37	69	}

...	...	@@ -134,7 +134,10 @@
134	134	@Autowired
135	135	private BabyHighRiskBabyService babyHighRiskBabyService;
136	136
	137	+ @Autowired
	138	+ private MeasureDataInfoService mysqlMeasureDataInfoService;
137	139
	140	+
138	141	@Autowired
139	142	@Qualifier("cfCheckItemService")
140	143	private CheckItemService checkItemService;
...	...	@@ -2038,6 +2041,18 @@
2038	2041	babyModel = models.get(0);
2039	2042	//根据规则完善儿保套餐（处理老数据，没有儿保月龄套餐）
2040	2043	checkModel.distOldTcType(babyModel);
	2044	+ }
	2045	+
	2046	+ if(null==checkModel.getBilirubinChest()){
	2047	+ MeasureBabyDataInfoQuery mquery = new MeasureBabyDataInfoQuery();
	2048	+ mquery.setBabyId(babyModel.getId());
	2049	+ List<MeasureBabyInfoModel> mmodels = mysqlMeasureDataInfoService.queryMeasureBabyInfoList(mquery);
	2050	+ if(mmodels.size()>0){
	2051	+ MeasureBabyInfoModel m=mmodels.get(0);
	2052	+ checkModel.setBilirubinChest(m.getJing());
	2053	+ checkModel.setBilirubinBelly(m.getPi());
	2054	+ checkModel.setBilirubinHead(m.getJing());
	2055	+ }
2041	2056	}
2042	2057
2043	2058	result = getBabyCheckResult(checkModel, babyModel);

...	...	@@ -1675,6 +1675,9 @@
1675	1675	model.setRecordCount(model.getRecordCount() + 1);
1676	1676	model.setValueOne(measureBabyInfoRequest.getValueOne());
1677	1677	model.setValueTwo(measureBabyInfoRequest.getValueTwo());
	1678	+ model.setJing(measureBabyInfoRequest.getJing());
	1679	+ model.setPi(measureBabyInfoRequest.getPi());
	1680	+ model.setDan(measureBabyInfoRequest.getDan());
1678	1681	model.setModified(new Date());
1679	1682	mysqlMeasureDataInfoService.updateMeasureBabyDataInfo(model);
1680	1683	} else {
...	...	@@ -1766,6 +1769,9 @@
1766	1769	map.put("height", model.getValueTwo());
1767	1770	map.put("recordTime", DateUtil.getyyyy_MM_dd(model.getModified()));
1768	1771	map.put("recordCount", model.getRecordCount());
	1772	+ map.put("jing",model.getJing());
	1773	+ map.put("pi",model.getPi());
	1774	+ map.put("dan",model.getDan());
1769	1775
1770	1776	String hospital = "";
1771	1777	if (org.apache.commons.lang.StringUtils.isNotEmpty(model.getHospitalId())) {

...	...	@@ -28,6 +28,38 @@
28	28
29	29	private String babyId;
30	30
	31	+ //经皮胆红素,start
	32	+ private String jing;
	33	+ private String pi;
	34	+ private String dan;
	35	+
	36	+ //经皮胆红素,end
	37	+
	38	+
	39	+ public String getJing() {
	40	+ return jing;
	41	+ }
	42	+
	43	+ public void setJing(String jing) {
	44	+ this.jing = jing;
	45	+ }
	46	+
	47	+ public String getPi() {
	48	+ return pi;
	49	+ }
	50	+
	51	+ public void setPi(String pi) {
	52	+ this.pi = pi;
	53	+ }
	54	+
	55	+ public String getDan() {
	56	+ return dan;
	57	+ }
	58	+
	59	+ public void setDan(String dan) {
	60	+ this.dan = dan;
	61	+ }
	62	+
31	63	public String getBabyId() {
32	64	return babyId;
33	65	}
...	...	@@ -86,6 +118,9 @@
86	118	model.setCreated(new Date());
87	119	model.setBabyId(babyId);
88	120	model.setValueType(valueType);
	121	+ model.setJing(jing);
	122	+ model.setPi(pi);
	123	+ model.setDan(dan);
89	124	return model;
90	125	}
91	126	}