diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java index 9b5bb46..e3fc708 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java @@ -693,6 +693,14 @@ public class LhxfyService { List lisReportModels = getLhxfyLis(premaritalCheckup.getCertificateNum()); if(CollectionUtils.isNotEmpty(lisReportModels)){ for (LisReportModel model : lisReportModels) { + + if (StringUtils.isEmpty(premaritalCheckup.getAssistDoctor())) + { + premaritalCheckup.setAssistDoctor("2100002225");//修素英 + premaritalCheckup.setAssistHospitalId("2100001605"); + premaritalCheckup.setAssistTime(model.getCheckTime()); + } + //获取检查结果 List itemModels = model.getItems(); if(CollectionUtils.isNotEmpty(itemModels)){ @@ -742,6 +750,12 @@ public class LhxfyService { case "GLU02": premaritalCheckup.setGlu(result); break; + case "004GLU-G": + if (!StringUtils.isNotEmpty(premaritalCheckup.getGlu())) + { + premaritalCheckup.setGlu(result); + } + break; /***血型***/ case "RH": if(result.contains("阳性")) { @@ -750,6 +764,14 @@ public class LhxfyService { premaritalCheckup.setRh("2"); } break; + /***血型***/ + case "RHD": + if(result.contains("阳性")) { + premaritalCheckup.setRh("1"); + }else if(result.contains("阴性")) { + premaritalCheckup.setRh("2"); + } + break; case "ABO": premaritalCheckup.setAbo(result); break; @@ -783,7 +805,15 @@ public class LhxfyService { break; /***女性阴道分泌物***/ case "QJD": - premaritalCheckup.setQjd(result); + if (result.equals("I") || result.equals("Ⅰ")) { + premaritalCheckup.setQjd("1"); + } else if (result.equals("II") || result.equals("Ⅱ")) { + premaritalCheckup.setQjd("2"); + } else if (result.equals("Ⅲ") || result.equals("III")) { + premaritalCheckup.setQjd("3"); + } else if (result.equals("IV") || result.equals("IV")) { + premaritalCheckup.setQjd("4"); + } break; case "XSXB": if(result.contains("阳性")) { @@ -800,7 +830,22 @@ public class LhxfyService { } break; case "PH02": - premaritalCheckup.setPh(result); + if (StringUtils.isNotEmpty(result)) + { + try { + Double ph = Double.parseDouble(result); + premaritalCheckup.setPh( ph < 4 ? "1" : "2"); + }catch (Exception e){} + } + break; + case "PH02_G": + if (StringUtils.isNotEmpty(result) && !StringUtils.isNotEmpty(premaritalCheckup.getPh())) + { + try { + Double ph = Double.parseDouble(result); + premaritalCheckup.setPh( ph < 4 ? "1" : "2"); + }catch (Exception e){} + } break; case "NZJ": if(result.contains("阳性")) {