diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml index 181ce72..a19d68c 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarScreen.xml @@ -64,16 +64,16 @@ insert into baby_patient_extend_ear_screen (id,baby_id,screen_type,check_hospita high_risk_cause = #{highRiskCause,jdbcType=VARCHAR}, - + oae_left = #{oaeLeft,jdbcType=INTEGER}, - + oae_right = #{oaeRight,jdbcType=INTEGER}, - + aabr_left = #{aabrLeft,jdbcType=INTEGER}, - + aabr_right = #{aabrRight,jdbcType=INTEGER}, @@ -202,16 +202,16 @@ select id,baby_id,screen_type,check_hospital_id,screen_date,high_risk_cause,oae_ and high_risk_cause = #{highRiskCause,jdbcType=VARCHAR} - + and oae_left = #{oaeLeft,jdbcType=INTEGER} - + and oae_right = #{oaeRight,jdbcType=INTEGER} - + and aabr_left = #{aabrLeft,jdbcType=INTEGER} - + and aabr_right = #{aabrRight,jdbcType=INTEGER} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java index 40e83e7..7b7d709 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java @@ -330,6 +330,7 @@ public class EarController extends BaseController { BabyPatientExtendEarScreenQuery query = new BabyPatientExtendEarScreenQuery(); query.setCheckHospitalId(hospitalId); query.setBabyId(babyId); + query.setStatus(0); query.setSort("create_date"); // d、本院:初筛未通过或复筛确诊 List screenList = screenService.queryBabyPatientExtendEarScreen(query); @@ -340,8 +341,7 @@ public class EarController extends BaseController { Map map = new HashMap<>(); //取第一条初筛记录结果 BabyPatientExtendEarScreen firstScreen = screenList.get(0); - //初筛未通过 - StringBuffer firstResu = new StringBuffer(); + if(firstScreen.getOaeLeft() == null){ firstScreen.setOaeLeft(1); } @@ -354,8 +354,9 @@ public class EarController extends BaseController { if(firstScreen.getAabrRight()==null){ firstScreen.setAabrRight(1); } - - if (firstScreen.getOaeLeft() == -1 || firstScreen.getOaeRight() == -1 || firstScreen.getAabrLeft() == -1 || firstScreen.getOaeRight() == -1) {//oae未通过 + //初筛未通过 + StringBuffer firstResu = new StringBuffer(); + if (firstScreen.getOaeLeft() == -1 || firstScreen.getOaeRight() == -1 || firstScreen.getAabrLeft() == -1 || firstScreen.getAabrRight() == -1) {//oae未通过 firstResu.append("未通过("); } if ((firstScreen.getOaeLeft() == -1 || firstScreen.getAabrLeft() == -1) && (firstScreen.getOaeRight() == -1 || firstScreen.getAabrRight() == -1)) {//oae未通过 @@ -365,7 +366,10 @@ public class EarController extends BaseController { } else if (firstScreen.getOaeRight() == -1 || firstScreen.getAabrRight() == -1) {//aabr未通过 firstResu.append("右耳"); } - firstResu.append(")"); + if(StringUtils.isNotEmpty(firstResu.toString())){ + firstResu.append(")"); + } + map.put("firstResu", firstResu.toString()); if ((firstScreen.getOaeLeft() == -1 || firstScreen.getOaeRight() == -1) && (firstScreen.getAabrLeft() == -1 || firstScreen.getAabrRight() == -1)) { map.put("firstMethod", "OAE/AABR"); @@ -393,7 +397,9 @@ public class EarController extends BaseController { } else if ((endScreen.getOaeRight()!=null&&endScreen.getOaeRight() == -1) || (endScreen.getAabrRight()!=null&&endScreen.getAabrRight() == -1)) {//aabr未通过 endResu.append("右耳"); } - endResu.append(")"); + if(StringUtils.isNotEmpty(endResu.toString())){ + endResu.append(")"); + } map.put("endResu", endResu.toString()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java index d7ff96d..8b18d8d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java @@ -191,6 +191,7 @@ public class BabyEarFacade { if(babyModel.getYn()!=YnEnums.YES.getId()){ babyModel.setYn(YnEnums.YES.getId()); babyModel.setModified(new Date()); + babyModel.setEnable("0"); babyService.updateOneBaby(babyModel, babyId); } } @@ -229,6 +230,10 @@ public class BabyEarFacade { babyModel.setHospitalId(hospitalId); babyModel.setYn(YnEnums.NO.getId()); babyModel.setCreated(new Date()); + babyModel.setId(null); + babyModel.setEnable("1"); + babyModel.setBuildDoctor(null); + babyModel.setBuildDate(new Date()); newBabyId = babyService.addOneBaby(babyModel).getId(); } else { newBabyId = babyModel.getId();