jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 912d330aecbb1bb9d879354ea46164863f719350

Authored by liquanyu
1 parent 676f76fd67
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

快速测量

Showing 2 changed files with 14 additions and 5 deletions

platform-biz-service/src/main/resources/mainOrm/master/MeasureDataInfoMapper.xml View file @ 912d330
... ... @@ -30,6 +30,7 @@
30 30 <result column="created" property="created"/>
31 31 <result column="modified" property="modified"/>
32 32 <result column="today_count" property="todayCount"/>
  33 + <result column="record_content" property="recordContent"/>
33 34 <result column="remark_value" property="remarkValue"/>
34 35 <association property="measureUserInfoModel" javaType="com.lyms.platform.pojo.MeasureUserInfoModel">
35 36 <result column="user_name" property="userName"/>
36 37  
37 38  
... ... @@ -54,16 +55,16 @@
54 55 <insert id="addMeasureDataInfo" parameterType="com.lyms.platform.pojo.MeasureDataInfoModel" >
55 56 INSERT INTO measure_data_info(measure_user_id,
56 57 value_one,value_two,value_three,value_type
57   - ,record_count,created,modified,today_count,remark_value)
  58 + ,record_count,created,modified,today_count,remark_value,record_content)
58 59 VALUES (#{measureUserId},#{valueOne}
59   - ,#{valueTwo},#{valueThree},#{valueType},#{recordCount},#{created},#{modified},#{todayCount},#{remarkValue})
  60 + ,#{valueTwo},#{valueThree},#{valueType},#{recordCount},#{created},#{modified},#{todayCount},#{remarkValue},#{recordContent})
60 61 </insert>
61 62  
62 63 <select id="queryMeasureDataInfoList" parameterType="com.lyms.platform.query.MeasureDataInfoQuery"
63 64 resultMap="measureDataInfoModelMap">
64 65 SELECT id,measure_user_id,
65 66 value_one,value_two,value_three,value_type
66   - ,record_count,created,modified,today_count,remark_value
  67 + ,record_count,created,modified,today_count,remark_value,recordContent
67 68 FROM measure_data_info
68 69 <include refid="queryMeasureDataInfoCondition"/>
69 70 <include refid="orderAndLimit"/>
... ... @@ -77,6 +78,7 @@
77 78 m.value_one,m.value_two,m.value_three,m.value_type,
78 79 m.record_count,m.created,m.modified,
79 80 m.today_count,m.remark_value,
  81 + m.record_content,
80 82 u.user_name,u.cert_type,
81 83 u.cert_no,u.age,u.phone,u.sex,u.vc_card_no,
82 84 u.hospital_id,u.patient_id,u.address,u.face,u.finger
... ... @@ -207,6 +209,9 @@
207 209 <if test="recordCount != null and recordCount >= 0">
208 210 record_count = #{recordCount,jdbcType=INTEGER},
209 211 </if>
  212 + <if test="recordContent != null">
  213 + record_content = #{recordContent,jdbcType=VARCHAR},
  214 + </if>
210 215 <if test="created != null">
211 216 created = #{created},
212 217 </if>
... ... @@ -257,6 +262,10 @@
257 262 </if>
258 263 <if test="recordCount != null and recordCount >= 0">
259 264 and record_count = #{recordCount,jdbcType=INTEGER}
  265 + </if>
  266 +
  267 + <if test="recordContent != null">
  268 + and record_content = #{recordContent,jdbcType=VARCHAR}
260 269 </if>
261 270 <if test="createdTimeStart != null">
262 271 AND created >= date_format(#{createdTimeStart},'%Y-%m-%d')
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java View file @ 912d330
... ... @@ -141,7 +141,7 @@
141 141 }
142 142 result.setHospitalName(hospital);
143 143  
144   - result.setRecordContent(model.getRecordContent());
  144 + result.setRecordContent(model.getRecordContent() == null ? "" : model.getRecordContent());
145 145  
146 146 results.add(result);
147 147 }
... ... @@ -256,7 +256,7 @@
256 256 }
257 257 dataInfoModel.setTodayCount(todayCount);
258 258  
259   - dataInfoModel.setRecordContent((measureDataInfoModel.getRecordContent() == null ? "" : measureDataInfoModel.getRecordContent()) + "," + measureInfoRequest.getValueOne());
  259 + dataInfoModel.setRecordContent((measureDataInfoModel.getRecordContent() == null ? "" : measureDataInfoModel.getRecordContent()+ "," ) + measureInfoRequest.getValueOne());
260 260 }
261 261 else
262 262 {