From 855ba694189b0fd3cb975b3eeb6ddcb3fda915fd Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Thu, 25 Nov 2021 17:53:38 +0800 Subject: [PATCH] update --- .../com/lyms/hospitalapi/lhxfy/LhxfyService.java | 116 ++++++++------------- 1 file changed, 44 insertions(+), 72 deletions(-) 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 d40f63f..68c88cf 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 @@ -100,7 +100,7 @@ public class LhxfyService { { Query query = new Query(); Date start = DateUtil.addDay(new Date(),-15); - query.addCriteria(Criteria.where("fillDate").gte(start)); + query.addCriteria(Criteria.where("fillDate").gte(start).and("hospitalId").is("2100001605"));//隆化定制 List preEugenicsBaseModels = mongoTemplate.find(query, PreEugenicsBaseModel.class); System.out.println("autoInLis="+preEugenicsBaseModels.size()); @@ -627,13 +627,15 @@ public class LhxfyService { mongoTemplate.updateFirst(query1, update, PreEugenicsBaseModel.class); } } + //隆化-妇女健康管理-男女婚检lis检查结果获取 + autoHjInLis(); } //隆化-妇女健康管理-男女婚检lis检查结果获取 public void autoHjInLis() { Query query = new Query(); Date start = DateUtil.addDay(new Date(),-15); - query.addCriteria(Criteria.where("premaritalUpTime").gte(start)); + query.addCriteria(Criteria.where("premaritalUpTime").gte(start).and("hospitalId").is("2100001605"));//隆化定制 //查询15天前院内婚检档案 List premaritalCheckupList = mongoTemplate.find(query, PremaritalCheckup.class); if (CollectionUtils.isNotEmpty(premaritalCheckupList)) @@ -694,13 +696,10 @@ public class LhxfyService { break; /***血型***/ case "RH": - switch (result){ - case "阳性": - premaritalCheckup.setRh("1"); - break; - case "阴性": - premaritalCheckup.setRh("2"); - break; + if(result.contains("阳性")) { + premaritalCheckup.setRh("1"); + }else if(result.contains("阴性")) { + premaritalCheckup.setRh("2"); } break; case "ABO": @@ -708,35 +707,26 @@ public class LhxfyService { break; /***梅毒筛查***/ case "TP-0": - switch (result){ - case "阳性": - premaritalCheckup.setTp("1"); - break; - case "阴性": - premaritalCheckup.setTp("2"); - break; + if(result.contains("阳性")) { + premaritalCheckup.setTp("1"); + }else if(result.contains("阴性")) { + premaritalCheckup.setTp("2"); } break; /***艾滋病筛查***/ case "HIV": - switch (result){ - case "阳性": - premaritalCheckup.setHiv("1"); - break; - case "阴性": - premaritalCheckup.setHiv("2"); - break; + if(result.contains("阳性")) { + premaritalCheckup.setHiv("1"); + }else if(result.contains("阴性")) { + premaritalCheckup.setHiv("2"); } break; /***乙肝表面抗原***/ case "HBSAG": - switch (result){ - case "阳性": - premaritalCheckup.setHbsag("1"); - break; - case "阴性": - premaritalCheckup.setHbsag("2"); - break; + if(result.contains("阳性")) { + premaritalCheckup.setHbsag("1"); + }else if(result.contains("阴性")) { + premaritalCheckup.setHbsag("2"); } break; /***转氨酶***/ @@ -748,66 +738,48 @@ public class LhxfyService { premaritalCheckup.setQjd(result); break; case "XSXB": - switch (result){ - case "阳性": - premaritalCheckup.setXsxb("1"); - break; - case "阴性": - premaritalCheckup.setXsxb("2"); - break; + if(result.contains("阳性")) { + premaritalCheckup.setXsxb("1"); + }else if(result.contains("阴性")) { + premaritalCheckup.setXsxb("2"); } break; case "DC": - switch (result){ - case "阳性": - premaritalCheckup.setDc("1"); - break; - case "阴性": - premaritalCheckup.setDc("2"); - break; + if(result.contains("阳性")) { + premaritalCheckup.setDc("1"); + }else if(result.contains("阴性")) { + premaritalCheckup.setDc("2"); } break; case "PH02": premaritalCheckup.setPh(result); break; case "NZJ": - switch (result){ - case "阳性": - premaritalCheckup.setNzj("1"); - break; - case "阴性": - premaritalCheckup.setNzj("2"); - break; + if(result.contains("阳性")) { + premaritalCheckup.setNzj("1"); + }else if(result.contains("阴性")) { + premaritalCheckup.setNzj("2"); } break; case "SYYYT": - switch (result){ - case "阳性": - premaritalCheckup.setSyyyt("1"); - break; - case "阴性": - premaritalCheckup.setSyyyt("2"); - break; + if(result.contains("阳性")) { + premaritalCheckup.setSyyyt("1"); + }else if(result.contains("阴性")) { + premaritalCheckup.setSyyyt("2"); } break; case "LQJ": - switch (result){ - case "阳性": - premaritalCheckup.setLqj("1"); - break; - case "阴性": - premaritalCheckup.setLqj("2"); - break; + if(result.contains("阳性")) { + premaritalCheckup.setLqj("1"); + }else if(result.contains("阴性")) { + premaritalCheckup.setLqj("2"); } break; case "ACWSY": - switch (result){ - case "阳性": - premaritalCheckup.setAcwsy("1"); - break; - case "阴性": - premaritalCheckup.setAcwsy("2"); - break; + if(result.contains("阳性")) { + premaritalCheckup.setAcwsy("1"); + }else if(result.contains("阴性")) { + premaritalCheckup.setAcwsy("2"); } break; } -- 1.8.3.1