jiangjiazhi / regional-platform

Download as
Browse Code »

Commit bab1e52d2d81585c342b68d23cd11f73823b9be3

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

听力诊断模块

Showing 3 changed files with 21 additions and 9 deletions

platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarFollowUp.xml View file @ bab1e52
... ... @@ -277,15 +277,23 @@
277 277 <include refid="BabyPatientExtendEarFollowUpCondition"/>
278 278 </select>
279 279  
280   - <select id="queryBabyPatientExtendEarFollowUpByBaby" resultMap="BabyPatientExtendEarFollowUpResultMap" parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarFollowUpQuery">
281   - select id,baby_id,follow_time,follow_addr,mark_time,mark_result,mark_detail,follow_info,audiphone,operation,artifi_cochlea,is_audiphone,is_operation,is_artifi_cochlea,guide_opinion,follow_doctor_name,follow_doctor_id,next_time,ifdel,ifclose,verdict,hospital_id,modify_time,modify_id,create_time,create_id,enalble
  280 + <select id="queryBabyPatientExtendEarFollowUpByBaby" resultMap="BabyPatientExtendEarFollowUpResultMap"
  281 + parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarFollowUpQuery">
  282 + select
  283 + id,baby_id,follow_time,follow_addr,mark_time,mark_result,mark_detail,follow_info,audiphone,operation,artifi_cochlea,is_audiphone,is_operation,is_artifi_cochlea,guide_opinion,follow_doctor_name,follow_doctor_id,next_time,ifdel,ifclose,verdict,hospital_id,modify_time,modify_id,create_time,create_id,enalble
282 284 from baby_patient_extend_ear_follow_up
283 285  
284 286 <where>
285   - 1 = 1
286   - <if test="babyId != null and babyId != ''">
287   - and baby_id = #{babyId,jdbcType=VARCHAR}
288   - </if>
  287 + 1 = 1
  288 + <if test="babyId != null and babyId != ''">
  289 + and baby_id = #{babyId,jdbcType=VARCHAR}
  290 + </if>
  291 + <if test="babyIds != null ">
  292 + and baby_id in
  293 + <foreach item="item" index="index" collection="babyIds" open="(" separator="," close=")">
  294 + #{item}
  295 + </foreach>
  296 + </if>
289 297 and ifdel = 0
290 298 </where>
291 299 </select>
platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml View file @ bab1e52
... ... @@ -464,6 +464,12 @@
464 464 <if test="babyId != null and babyId != ''">
465 465 and baby_id = #{babyId,jdbcType=VARCHAR}
466 466 </if>
  467 + <if test="babyIds != null ">
  468 + and baby_id in
  469 + <foreach item="item" index="index" collection="babyIds" open="(" separator="," close=")">
  470 + #{item}
  471 + </foreach>
  472 + </if>
467 473 <if test="hospitalId != null and hospitalId != ''">
468 474 and hospital_id = #{hospitalId,jdbcType=VARCHAR}
469 475 </if>
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearDiagnManageController.java View file @ bab1e52
... ... @@ -914,10 +914,8 @@
914 914 if (model.getDiagnDoctorId() != null) {
915 915 screenQuery.setCheckDoctorId(model.getDiagnDoctorId());
916 916 }
917   - if(CollectionUtils.isNotEmpty(babyIds)){
918   - screenQuery.setBabyIds(babyIds.toArray(new String[babyIds.size()]));
919   - }
920 917 screenQuery.setCheckHospitalId(hospitalId);
  918 +
921 919 //查询全部数据
922 920 List<BabyPatientExtendEarScreen> earScreens = screenService.queryBabyPatientExtendEarScreen(screenQuery);
923 921 Map<String, BabyPatientExtendEarScreen> screenMap = new HashMap<>();