diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java index e8b4c30..49a095d 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java @@ -280,6 +280,7 @@ public class LisServiceImpl implements LisService { } params.put(code, item.getResult().trim()); } + //TODO 稀有血型 Rh血型(D)抗原鉴定 阴性 code:rh //TODO code HBcAb-J 乙肝表面抗原 HBeAb-J 乙肝表面抗体 HBeAg-j 乙肝e抗原 HBsAb-J 乙肝e抗体 HBsAg-J 乙肝核心抗体 HIV(1+2)抗体-J 人类免疫缺陷病毒抗体 TP-抗体 梅毒螺旋体抗体 String time = DateUtil.getyyyy_MM_dd(new Date()); //根据辅助检查项日期判断是初检还是复检 @@ -390,7 +391,8 @@ public class LisServiceImpl implements LisService { p=true; patients.setGlucm(params.get("GLUCm")); } - //TODO code HBcAb-J 乙肝表面抗原 HBeAb-J 乙肝表面抗体 HBeAg-j 乙肝e抗原 HBsAb-J 乙肝e抗体 HBsAg-J 乙肝核心抗体 HIV(1+2)抗体-J 人类免疫缺陷病毒抗体 TP-抗体 梅毒螺旋体抗体 + //TODO 稀有血型 Rh血型(D)抗原鉴定 阴性 code:rh + //TODO code HBcAb-J 乙肝表面抗原 HBeAb-J 乙肝表面抗体 HBeAg-j 乙肝e抗原 HBsAb-J 乙肝e抗体 HBsAg-J 乙肝核心抗体 HIV(1+2)抗体-J 人类免疫缺陷病毒抗体 TP-抗体 梅毒螺旋体抗体 if (StringUtils.isNotEmpty(params.get("HBcAb-J"))){ p=true; patients.setHBcAbJ(params.get("HBcAb-J")); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 7385351..3eae3b6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -1768,12 +1768,13 @@ public class PatientFacade extends BaseServiceImpl { }*/ //riskPatientsQueryRequest.sethId(hospital); //组合请求 - PatientsQuery patientsQuery = new PatientsQuery();//complayRequest(riskPatientsQueryRequest, isHighRisk, type, userId, needPage, isRegion); - patientsQuery.setHospitalId(hospital); + PatientsQuery patientsQuery= complayRequest(riskPatientsQueryRequest, isHighRisk, type, userId, needPage, isRegion);/*= new PatientsQuery();*/ + /*patientsQuery.setHospitalId(hospital); patientsQuery.setNeed(needPage); patientsQuery.setType(type); + patientsQuery.setLimit(riskPatientsQueryRequest.getLimit()); - patientsQuery.setPage(riskPatientsQueryRequest.getPage()); + patientsQuery.setPage(riskPatientsQueryRequest.getPage());*/ //查询符合条件的孕妇 StopWatch stopWatch = new StopWatch("queryPatient1 -" + hospital); stopWatch.start();