jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 24bbc144113aaa3b686ffd10178536e024931716

Authored by yangfei
1 parent 9d82dbb077
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

听力诊断模块

Showing 3 changed files with 25 additions and 14 deletions

platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml View file @ 24bbc14
... ... @@ -64,16 +64,16 @@
64 64 <if test="highRiskCause != null and highRiskCause != ''">
65 65 high_risk_cause = #{highRiskCause,jdbcType=VARCHAR},
66 66 </if>
67   - <if test="oaeLeft != null and oaeLeft >= 0">
  67 + <if test="oaeLeft != null">
68 68 oae_left = #{oaeLeft,jdbcType=INTEGER},
69 69 </if>
70   - <if test="oaeRight != null and oaeRight >= 0">
  70 + <if test="oaeRight != null">
71 71 oae_right = #{oaeRight,jdbcType=INTEGER},
72 72 </if>
73   - <if test="aabrLeft != null and aabrLeft >= 0">
  73 + <if test="aabrLeft != null">
74 74 aabr_left = #{aabrLeft,jdbcType=INTEGER},
75 75 </if>
76   - <if test="aabrRight != null and aabrRight >= 0">
  76 + <if test="aabrRight != null">
77 77 aabr_right = #{aabrRight,jdbcType=INTEGER},
78 78 </if>
79 79 <if test="gjb2Del35 != null and gjb2Del35 >= 0">
80 80  
81 81  
82 82  
... ... @@ -202,16 +202,16 @@
202 202 <if test="highRiskCause != null and highRiskCause != ''">
203 203 and high_risk_cause = #{highRiskCause,jdbcType=VARCHAR}
204 204 </if>
205   - <if test="oaeLeft != null and oaeLeft >= 0">
  205 + <if test="oaeLeft != null">
206 206 and oae_left = #{oaeLeft,jdbcType=INTEGER}
207 207 </if>
208   - <if test="oaeRight != null and oaeRight >= 0">
  208 + <if test="oaeRight != null">
209 209 and oae_right = #{oaeRight,jdbcType=INTEGER}
210 210 </if>
211   - <if test="aabrLeft != null and aabrLeft >= 0">
  211 + <if test="aabrLeft != null">
212 212 and aabr_left = #{aabrLeft,jdbcType=INTEGER}
213 213 </if>
214   - <if test="aabrRight != null and aabrRight >= 0">
  214 + <if test="aabrRight != null">
215 215 and aabr_right = #{aabrRight,jdbcType=INTEGER}
216 216 </if>
217 217 <if test="gjb2Del35 != null and gjb2Del35 >= 0">
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java View file @ 24bbc14
... ... @@ -330,6 +330,7 @@
330 330 BabyPatientExtendEarScreenQuery query = new BabyPatientExtendEarScreenQuery();
331 331 query.setCheckHospitalId(hospitalId);
332 332 query.setBabyId(babyId);
  333 + query.setStatus(0);
333 334 query.setSort("create_date");
334 335 // d、本院：初筛未通过或复筛确诊
335 336 List<BabyPatientExtendEarScreen> screenList = screenService.queryBabyPatientExtendEarScreen(query);
... ... @@ -340,8 +341,7 @@
340 341 Map<String, String> map = new HashMap<>();
341 342 //取第一条初筛记录结果
342 343 BabyPatientExtendEarScreen firstScreen = screenList.get(0);
343   - //初筛未通过
344   - StringBuffer firstResu = new StringBuffer();
  344 +
345 345 if(firstScreen.getOaeLeft() == null){
346 346 firstScreen.setOaeLeft(1);
347 347 }
... ... @@ -354,8 +354,9 @@
354 354 if(firstScreen.getAabrRight()==null){
355 355 firstScreen.setAabrRight(1);
356 356 }
357   -
358   - if (firstScreen.getOaeLeft() == -1 || firstScreen.getOaeRight() == -1 || firstScreen.getAabrLeft() == -1 || firstScreen.getOaeRight() == -1) {//oae未通过
  357 + //初筛未通过
  358 + StringBuffer firstResu = new StringBuffer();
  359 + if (firstScreen.getOaeLeft() == -1 || firstScreen.getOaeRight() == -1 || firstScreen.getAabrLeft() == -1 || firstScreen.getAabrRight() == -1) {//oae未通过
359 360 firstResu.append("未通过(");
360 361 }
361 362 if ((firstScreen.getOaeLeft() == -1 || firstScreen.getAabrLeft() == -1) && (firstScreen.getOaeRight() == -1 || firstScreen.getAabrRight() == -1)) {//oae未通过
... ... @@ -365,7 +366,10 @@
365 366 } else if (firstScreen.getOaeRight() == -1 || firstScreen.getAabrRight() == -1) {//aabr未通过
366 367 firstResu.append("右耳");
367 368 }
368   - firstResu.append(")");
  369 + if(StringUtils.isNotEmpty(firstResu.toString())){
  370 + firstResu.append(")");
  371 + }
  372 +
369 373 map.put("firstResu", firstResu.toString());
370 374 if ((firstScreen.getOaeLeft() == -1 || firstScreen.getOaeRight() == -1) && (firstScreen.getAabrLeft() == -1 || firstScreen.getAabrRight() == -1)) {
371 375 map.put("firstMethod", "OAE/AABR");
... ... @@ -393,7 +397,9 @@
393 397 } else if ((endScreen.getOaeRight()!=null&&endScreen.getOaeRight() == -1) || (endScreen.getAabrRight()!=null&&endScreen.getAabrRight() == -1)) {//aabr未通过
394 398 endResu.append("右耳");
395 399 }
396   - endResu.append(")");
  400 + if(StringUtils.isNotEmpty(endResu.toString())){
  401 + endResu.append(")");
  402 + }
397 403  
398 404 map.put("endResu", endResu.toString());
399 405  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java View file @ 24bbc14
... ... @@ -191,6 +191,7 @@
191 191 if(babyModel.getYn()!=YnEnums.YES.getId()){
192 192 babyModel.setYn(YnEnums.YES.getId());
193 193 babyModel.setModified(new Date());
  194 + babyModel.setEnable("0");
194 195 babyService.updateOneBaby(babyModel, babyId);
195 196 }
196 197 }
... ... @@ -229,6 +230,10 @@
229 230 babyModel.setHospitalId(hospitalId);
230 231 babyModel.setYn(YnEnums.NO.getId());
231 232 babyModel.setCreated(new Date());
  233 + babyModel.setId(null);
  234 + babyModel.setEnable("1");
  235 + babyModel.setBuildDoctor(null);
  236 + babyModel.setBuildDate(new Date());
232 237 newBabyId = babyService.addOneBaby(babyModel).getId();
233 238 } else {
234 239 newBabyId = babyModel.getId();