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 d0d6e1c..de22937 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 @@ -857,15 +857,15 @@ public class LhxfyService { // } // break; /***乙肝表面抗原***/ -// case "HBSAG-1": -// if(StringUtils.isEmpty(premaritalCheckup.getHbsag())) { -// if(result.contains("阳性")) { -// premaritalCheckup.setHbsag("1"); -// }else if(result.contains("阴性")) { -// premaritalCheckup.setHbsag("2"); -// } -// } -// break; + case "HBSAG-1": + if(StringUtils.isEmpty(premaritalCheckup.getHbsag())) { + if(result.contains("阳性")) { + premaritalCheckup.setHbsag("1"); + }else if(result.contains("阴性")) { + premaritalCheckup.setHbsag("2"); + } + } + break; /***转氨酶***/ case "001ALT": if(StringUtils.isEmpty(premaritalCheckup.getAlt())) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index 7e61279..5c0f857 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -5394,14 +5394,17 @@ public class TestController extends BaseController { organizationQuery.setStreetId(streetId); organizationQuery.setId(hid); List organizations = organizationService.queryHospitals(organizationQuery); + int count = 0; + System.out.println("org size "+ organizations.size()); if (CollectionUtils.isNotEmpty(organizations)) { for (Organization org : organizations) { - + System.out.println(org.getName()+"org count =="+count); + count++; BabyModelQuery babyModelQuery = new BabyModelQuery(); babyModelQuery.setYn(YnEnums.YES.getId()); - babyModelQuery.setId(org.getId()+""); + babyModelQuery.setHospitalId(org.getId()+""); babyModelQuery.setLastCheckDoctor2(true); List models = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); @@ -5481,10 +5484,14 @@ public class TestController extends BaseController { organizationQuery.setStreetId(streetId); organizationQuery.setId(hid); List organizations = organizationService.queryHospitals(organizationQuery); + System.out.println("org size "+ organizations.size()); + int count = 1; if (CollectionUtils.isNotEmpty(organizations)) { for (Organization org : organizations) { + System.out.println(org.getName()+"org count =="+count); + count++; PatientsQuery patientsQuery=new PatientsQuery(); patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setHospitalId(org.getId()+""); @@ -5497,9 +5504,7 @@ public class TestController extends BaseController { patientsQuery.setPostViewTimesStart(1); patientsQuery.setPostViewTimesEnd(10); - List models = patientsService.queryPatient(patientsQuery); - System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString()); System.out.println("updatePregCompleteCheck="+org.getName()+"; patients = "+models.size()); if (CollectionUtils.isNotEmpty(models)) { for (Patients patients : models) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index a14d211..e57eed8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -6523,7 +6523,7 @@ public class AntenatalExaminationFacade { int bc = (int)mongoTemplate.count(Query.query(criteria6), AntExChuModel.class); - Criteria criteria7 = Criteria.where("hospitalId").is(hospitalId).and("tx").exists(true); + Criteria criteria7 = Criteria.where("hospitalId").is(hospitalId).and("placentas.heartRate").exists(true); if (startDate != null) { criteria7.and("checkTime").gte(startDate).lte(endDate); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java index b132001..c74b50e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java @@ -3308,8 +3308,9 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { //累计活产数 babyModelQuery.setBirthStart(null); int data2 = (int)mongoTemplate.count(babyModelQuery.convertToQuery().convertToMongoQuery(),BabyModel.class); - + System.out.println("======"+data2); int lastDate2= null==hospitalDate.get("data2")?0:Integer.parseInt(hospitalDate.get("data2").toString()); + hospitalDate.put("data2",data2+lastDate2); @@ -4326,6 +4327,9 @@ public class PatientSyncMysqlFacade extends BaseServiceImpl { { patientsQuery.setHospitalList(hospitalIds); patientsQuery.setIsComplete(2); + patientsQuery.setPage(page); + patientsQuery.setLimit(limit); + patientsQuery.setNeed("true"); List datas = patientsService.queryPatient(patientsQuery); System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString()); if (CollectionUtils.isNotEmpty(datas)) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java index 67a9e8d..c8c9bea 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java @@ -439,18 +439,18 @@ public class ResidentsArchiveFacade { query.setYn(YnEnums.YES.getId()); query.setHospitalId(addRequest.getHospitalId()); - if (StringUtils.isNotEmpty(addRequest.getCertificateNum())) { - //判断该证件号码是否在该医院建档 - query.setCertificateNum(addRequest.getCertificateNum()); - query.setCertificateTypeId(addRequest.getCertificateTypeId()); - query.setType(addRequest.getType()); - List modelList = residentsArchiveService.queryResident(query); - if (CollectionUtils.isNotEmpty(modelList)) { - br.setErrorcode(ErrorCodeConstants.DATA_EXIST); - br.setErrormsg("该证件号在医院已经建档"); - return br; - } - } +// if (StringUtils.isNotEmpty(addRequest.getCertificateNum())) { +// //判断该证件号码是否在该医院建档 +// query.setCertificateNum(addRequest.getCertificateNum()); +// query.setCertificateTypeId(addRequest.getCertificateTypeId()); +// query.setType(addRequest.getType()); +// List modelList = residentsArchiveService.queryResident(query); +// if (CollectionUtils.isNotEmpty(modelList)) { +// br.setErrorcode(ErrorCodeConstants.DATA_EXIST); +// br.setErrormsg("该证件号在医院已经建档"); +// return br; +// } +// } //保存建档数据 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java index d4fb327..b1f6ebf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java @@ -1514,6 +1514,10 @@ public class AntExAddRequest implements IBasicRequestConvert { if (CollectionUtils.isNotEmpty(otherHighRisk)) { antExChuModel.setOtherHighRisk(JsonUtil.array2JsonString(otherHighRisk)); } + else if (otherHighRisk != null && otherHighRisk.size() == 0) + { + antExChuModel.setOtherHighRisk("[]"); + } if (null != diagnosis) { antExChuModel.setDiagnosis(JsonUtil.array2JsonString(diagnosis)); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java index b39262d..dcc961f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java @@ -5517,7 +5517,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService Map cnames = new LinkedHashMap<>(); cnames.put("name", "姓名"); //姓名 - cnames.put("phone", "建档孕周"); //电话 + cnames.put("phone", "电话"); //电话 cnames.put("cardNo", "身份证号"); //身份证号 cnames.put("address", "居住地址"); //居住地址 cnames.put("created", "建档时间"); //建档时间