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 6d6afe7..40e83e7 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 @@ -342,6 +342,19 @@ public class EarController extends BaseController { BabyPatientExtendEarScreen firstScreen = screenList.get(0); //初筛未通过 StringBuffer firstResu = new StringBuffer(); + if(firstScreen.getOaeLeft() == null){ + firstScreen.setOaeLeft(1); + } + if(firstScreen.getOaeRight()==null){ + firstScreen.setOaeRight(1); + } + if(firstScreen.getAabrLeft()==null){ + firstScreen.setAabrLeft(1); + } + if(firstScreen.getAabrRight()==null){ + firstScreen.setAabrRight(1); + } + if (firstScreen.getOaeLeft() == -1 || firstScreen.getOaeRight() == -1 || firstScreen.getAabrLeft() == -1 || firstScreen.getOaeRight() == -1) {//oae未通过 firstResu.append("未通过("); } 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 8998ba7..d7ff96d 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 @@ -26,6 +26,7 @@ import com.lyms.platform.pojo.PersonModel; import com.lyms.platform.query.BabyModelQuery; import com.lyms.platform.query.PersonModelQuery; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections.map.HashedMap; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; import org.slf4j.Logger; @@ -1296,7 +1297,7 @@ public class BabyEarFacade { } public Map buildBabyEarResult(BabyPatientExtendEarScreen babyPatientExtendEarScreen) { - Map data = new HashMap<>(); + Map data = new HashedMap(); data.put("id", babyPatientExtendEarScreen.getId()); data.put("babyId", babyPatientExtendEarScreen.getBabyId()); data.put("screenTypeStr", babyPatientExtendEarScreen.getScreenType() == 1 ? "初筛" : "复筛");//1= 2= @@ -1327,31 +1328,31 @@ public class BabyEarFacade { data.put("highRiskCauseStr", hfBuff.toString()); data.put("highRiskCause", highArr); } - data.put("oaeLeft", babyPatientExtendEarScreen.getOaeLeft()); + data.put("oaeLeft", babyPatientExtendEarScreen.getOaeLeft()==null?"":babyPatientExtendEarScreen.getOaeLeft()); data.put("oaeLeftStr", BabyEarResultEnums.getTitle(babyPatientExtendEarScreen.getOaeLeft() == null ? 0 : babyPatientExtendEarScreen.getOaeLeft())); - data.put("oaeRight", babyPatientExtendEarScreen.getOaeRight()); + data.put("oaeRight", babyPatientExtendEarScreen.getOaeRight()==null?"":babyPatientExtendEarScreen.getOaeRight()); data.put("oaeRightStr", BabyEarResultEnums.getTitle(babyPatientExtendEarScreen.getOaeRight() == null ? 0 : babyPatientExtendEarScreen.getOaeRight())); - data.put("aabrLeft", babyPatientExtendEarScreen.getAabrLeft()); + data.put("aabrLeft", babyPatientExtendEarScreen.getAabrLeft()==null?"":babyPatientExtendEarScreen.getAabrLeft()); data.put("aabrLeftStr", BabyEarResultEnums.getTitle(babyPatientExtendEarScreen.getAabrLeft() == null ? 0 : babyPatientExtendEarScreen.getAabrLeft())); - data.put("aabrRight", babyPatientExtendEarScreen.getAabrRight()); + data.put("aabrRight", babyPatientExtendEarScreen.getAabrRight()==null?"":babyPatientExtendEarScreen.getAabrRight()); data.put("aabrRightStr", BabyEarResultEnums.getTitle(babyPatientExtendEarScreen.getAabrRight() == null ? 0 : babyPatientExtendEarScreen.getAabrRight())); - data.put("gjb2Del35", babyPatientExtendEarScreen.getGjb2Del35() + ""); + data.put("gjb2Del35", babyPatientExtendEarScreen.getGjb2Del35() ==null?"":babyPatientExtendEarScreen.getGjb2Del35()); data.put("gjb2Del35Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb2Del35() == null ? 0 : babyPatientExtendEarScreen.getGjb2Del35())); - data.put("gjb2Del176", babyPatientExtendEarScreen.getGjb2Del176() + ""); + data.put("gjb2Del176", babyPatientExtendEarScreen.getGjb2Del176() ==null?"":babyPatientExtendEarScreen.getGjb2Del176()); data.put("gjb2Del176Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb2Del176() == null ? 0 : babyPatientExtendEarScreen.getGjb2Del176())); - data.put("gjb2Del235", babyPatientExtendEarScreen.getGjb2Del235() + ""); + data.put("gjb2Del235", babyPatientExtendEarScreen.getGjb2Del235() ==null?"":babyPatientExtendEarScreen.getGjb2Del235()); data.put("gjb2Del235Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb2Del235() == null ? 0 : babyPatientExtendEarScreen.getGjb2Del235())); - data.put("gjb2Del299", babyPatientExtendEarScreen.getGjb2Del299() + ""); + data.put("gjb2Del299", babyPatientExtendEarScreen.getGjb2Del299()==null?"":babyPatientExtendEarScreen.getGjb2Del299()); data.put("gjb2Del299Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb2Del299() == null ? 0 : babyPatientExtendEarScreen.getGjb2Del299())); - data.put("gjb3Slc26a4538", babyPatientExtendEarScreen.getGjb3Slc26a4538() + ""); + data.put("gjb3Slc26a4538", babyPatientExtendEarScreen.getGjb3Slc26a4538() ==null?"":babyPatientExtendEarScreen.getGjb3Slc26a4538()); data.put("gjb3Slc26a4538Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb3Slc26a4538() == null ? 0 : babyPatientExtendEarScreen.getGjb3Slc26a4538())); - data.put("gjb3Slc26a42168", babyPatientExtendEarScreen.getGjb3Slc26a42168() + ""); + data.put("gjb3Slc26a42168", babyPatientExtendEarScreen.getGjb3Slc26a42168() ==null?"":babyPatientExtendEarScreen.getGjb3Slc26a42168()); data.put("gjb3Slc26a42168Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb3Slc26a42168() == null ? 0 : babyPatientExtendEarScreen.getGjb3Slc26a42168())); - data.put("gjb3Slc26a4Ivs7", babyPatientExtendEarScreen.getGjb3Slc26a4Ivs7() + ""); + data.put("gjb3Slc26a4Ivs7", babyPatientExtendEarScreen.getGjb3Slc26a4Ivs7() ==null?"":babyPatientExtendEarScreen.getGjb3Slc26a4Ivs7()); data.put("gjb3Slc26a4Ivs7Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getGjb3Slc26a4Ivs7() == null ? 0 : babyPatientExtendEarScreen.getGjb3Slc26a4Ivs7())); - data.put("rrna1494", babyPatientExtendEarScreen.getRrna1494() + ""); + data.put("rrna1494", babyPatientExtendEarScreen.getRrna1494()==null?"":babyPatientExtendEarScreen.getRrna1494()); data.put("rrna1494Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getRrna1494() == null ? 0 : babyPatientExtendEarScreen.getRrna1494())); - data.put("rrna1555", babyPatientExtendEarScreen.getRrna1555() + ""); + data.put("rrna1555", babyPatientExtendEarScreen.getRrna1555() ==null?"":babyPatientExtendEarScreen.getRrna1555()); data.put("rrna1555Str", DeafEnums.getTitle(babyPatientExtendEarScreen.getRrna1555() == null ? 0 : babyPatientExtendEarScreen.getRrna1555())); data.put("processOptionType", babyPatientExtendEarScreen.getProcessOptionType());//1=复筛 2=诊断 data.put("processOptionTypeStr", babyPatientExtendEarScreen.getProcessOptionType() == null ? "初诊" : babyPatientExtendEarScreen.getProcessOptionType() == 1 ? "复筛" : "诊断");//1=复筛 2=诊断