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 e3fc708..196ff86 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 @@ -748,12 +748,13 @@ public class LhxfyService { break; /***尿常规检查***/ case "GLU02": - premaritalCheckup.setGlu(result); - break; - case "004GLU-G": - if (!StringUtils.isNotEmpty(premaritalCheckup.getGlu())) + if(result.equals("- 0")) + { + premaritalCheckup.setGlu("阴性"); + } + else { - premaritalCheckup.setGlu(result); + premaritalCheckup.setGlu("阳性"); } break; /***血型***/ @@ -776,7 +777,8 @@ public class LhxfyService { premaritalCheckup.setAbo(result); break; /***梅毒筛查***/ - case "TP-0": + + case "TP-1": if(result.contains("阳性")) { premaritalCheckup.setTp("1"); }else if(result.contains("阴性")) { @@ -785,14 +787,15 @@ public class LhxfyService { break; /***艾滋病筛查***/ case "HIV": - if(result.contains("阳性")) { - premaritalCheckup.setHiv("1"); - }else if(result.contains("阴性")) { - premaritalCheckup.setHiv("2"); - } + premaritalCheckup.setHiv("yin"); +// if(result.contains("阳性")) { +// premaritalCheckup.setHiv("1"); +// }else if(result.contains("阴性")) { +// premaritalCheckup.setHiv("2"); +// } break; /***乙肝表面抗原***/ - case "HBSAG": + case "HBSAG-1": if(result.contains("阳性")) { premaritalCheckup.setHbsag("1"); }else if(result.contains("阴性")) { @@ -800,7 +803,7 @@ public class LhxfyService { } break; /***转氨酶***/ - case "ALT": + case "001ALT": premaritalCheckup.setAlt(result); break; /***女性阴道分泌物***/