Commit b503156cc8b2829ea1e1a1fb54562e0d39acf5c2

Authored by liquanyu
1 parent 1aa555441c

update code

Showing 6 changed files with 47 additions and 4 deletions

platform-biz-service/src/main/resources/mainOrm/master/MeasureInfoMapper.xml View file @ b503156
... ... @@ -25,25 +25,26 @@
25 25 <result column="created" property="created"/>
26 26 <result column="modified" property="modified"/>
27 27 <result column="today_count" property="todayCount"/>
  28 + <result column="zy_no" property="zyNo"/>
28 29 </resultMap>
29 30  
30 31 <insert id="addMeasureInfo" parameterType="com.lyms.platform.pojo.MeasureInfoModel" >
31 32 INSERT INTO measure_info(user_name,cert_type,
32 33 cert_no,age,phone,sex,vc_card_no,
33 34 value_one,value_two,value_three,value_type,record_time,wx_code
34   - ,record_count,open_id,created,modified,hospital_id,today_count)
  35 + ,record_count,open_id,created,modified,hospital_id,today_count,zy_no)
35 36 VALUES (#{userName},#{certType},
36 37 #{certNo},#{age},#{phone},#{sex}
37 38 ,#{vcCardNo},#{valueOne}
38 39 ,#{valueTwo},#{valueThree},#{valueType},#{recordTime},
39   - #{wxCode},#{recordCount},#{openId},#{created},#{modified},#{hospitalId},#{todayCount})
  40 + #{wxCode},#{recordCount},#{openId},#{created},#{modified},#{hospitalId},#{todayCount},#{zyNo})
40 41 </insert>
41 42  
42 43 <select id="queryMeasureInfoList" parameterType="com.lyms.platform.query.MeasureInfoQuery" resultMap="measureInfoModelMap">
43 44 SELECT id,user_name,cert_type,
44 45 cert_no,age,phone,sex,vc_card_no,
45 46 value_one,value_two,value_three,value_type,record_time,wx_code
46   - ,record_count,open_id,created,modified,hospital_id,today_count
  47 + ,record_count,open_id,created,modified,hospital_id,today_count,,zy_no
47 48 FROM measure_info
48 49  
49 50 <include refid="queryMeasureInfoCondition"/>
... ... @@ -84,6 +85,9 @@
84 85 <if test="vcCardNo != null">
85 86 vc_card_no = #{vcCardNo,jdbcType=VARCHAR},
86 87 </if>
  88 + <if test="zyNo != null">
  89 + zy_no = #{zyNo,jdbcType=VARCHAR},
  90 + </if>
87 91 <if test="valueOne != null and valueOne != ''">
88 92 value_one = #{valueOne,jdbcType=VARCHAR},
89 93 </if>
... ... @@ -161,6 +165,9 @@
161 165 </if>
162 166 <if test="vcCardNo != null and vcCardNo != ''">
163 167 and vc_card_no = #{vcCardNo,jdbcType=VARCHAR}
  168 + </if>
  169 + <if test="zyNo != null and zyNo != ''">
  170 + and zy_no = #{zyNo,jdbcType=VARCHAR}
164 171 </if>
165 172 <if test="valueOne != null and valueOne != ''">
166 173 and value_one = #{valueOne,jdbcType=VARCHAR}
platform-dal/src/main/java/com/lyms/platform/pojo/MeasureInfoModel.java View file @ b503156
... ... @@ -55,6 +55,17 @@
55 55 //当天记录次数
56 56 private Integer todayCount;
57 57  
  58 + //住院号
  59 + private String zyNo;
  60 +
  61 + public String getZyNo() {
  62 + return zyNo;
  63 + }
  64 +
  65 + public void setZyNo(String zyNo) {
  66 + this.zyNo = zyNo;
  67 + }
  68 +
58 69 public String getValueThree() {
59 70 return valueThree;
60 71 }
platform-dal/src/main/java/com/lyms/platform/query/MeasureInfoQuery.java View file @ b503156
... ... @@ -65,9 +65,10 @@
65 65 private Date recordTime;
66 66  
67 67 private Integer todayCount;
  68 + //住院号
  69 + private String zyNo;
68 70  
69 71  
70   -
71 72 @Override
72 73 public MongoQuery convertToQuery() {
73 74 MongoCondition condition = MongoCondition.newInstance();
... ... @@ -148,6 +149,14 @@
148 149 condition = condition.andCondition(new MongoCondition(c1));
149 150 }
150 151 return condition.toMongoQuery();
  152 + }
  153 +
  154 + public String getZyNo() {
  155 + return zyNo;
  156 + }
  157 +
  158 + public void setZyNo(String zyNo) {
  159 + this.zyNo = zyNo;
151 160 }
152 161  
153 162 public String getValueThree() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MeasureInfoController.java View file @ b503156
... ... @@ -76,6 +76,7 @@
76 76 @RequestParam(value = "hospitalId", required = false) String hospitalId,
77 77 @RequestParam(value = "age", required = false) Integer age,
78 78 @RequestParam(value = "phone", required = false) String phone,
  79 + @RequestParam(value = "zyNo", required = false) String zyNo,
79 80 HttpServletRequest request) {
80 81 MeasureInfoRequest measureInfoRequest = new MeasureInfoRequest();
81 82 measureInfoRequest.setUserName(userName);
... ... @@ -92,6 +93,7 @@
92 93 measureInfoRequest.setRecordTime(new Date().getTime());
93 94 measureInfoRequest.setRecordCount(1);
94 95 measureInfoRequest.setValueType(2);
  96 + measureInfoRequest.setZyNo(zyNo);
95 97 System.out.println(" 添加血压和脉搏请求参数:"+measureInfoRequest.toString());
96 98 return measureInfoFacade.addMeasureInfo(measureInfoRequest);
97 99 }
... ... @@ -116,6 +118,7 @@
116 118 @RequestParam(value = "hospitalId", required = false) String hospitalId,
117 119 @RequestParam(value = "age", required = false) Integer age,
118 120 @RequestParam(value = "phone", required = false) String phone,
  121 + @RequestParam(value = "zyNo", required = false) String zyNo,
119 122 HttpServletRequest request) {
120 123 MeasureInfoRequest measureInfoRequest = new MeasureInfoRequest();
121 124 measureInfoRequest.setUserName(userName);
... ... @@ -133,6 +136,7 @@
133 136 measureInfoRequest.setRecordTime(new Date().getTime());
134 137 measureInfoRequest.setRecordCount(1);
135 138 measureInfoRequest.setValueType(1);
  139 + measureInfoRequest.setZyNo(zyNo);
136 140 System.out.println("添加体重和身高请求参数:"+measureInfoRequest.toString());
137 141 return measureInfoFacade.addMeasureInfo(measureInfoRequest);
138 142 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java View file @ b503156
... ... @@ -241,6 +241,7 @@
241 241 model.setVcCardNo(measureInfoRequest.getVcCardNo());
242 242 model.setWxCode(measureInfoRequest.getWxCode());
243 243 model.setPhone(measureInfoRequest.getPhone());
  244 + model.setZyNo(measureInfoRequest.getZyNo());
244 245 return model;
245 246 }
246 247 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MeasureInfoRequest.java View file @ b503156
... ... @@ -41,6 +41,17 @@
41 41 //手机号码
42 42 private String phone;
43 43  
  44 + //住院号
  45 + private String zyNo;
  46 +
  47 + public String getZyNo() {
  48 + return zyNo;
  49 + }
  50 +
  51 + public void setZyNo(String zyNo) {
  52 + this.zyNo = zyNo;
  53 + }
  54 +
44 55 public String getValueThree() {
45 56 return valueThree;
46 57 }