diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PostkfModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PostkfModel.java index f3fd578..ba0aed2 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PostkfModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PostkfModel.java @@ -27,6 +27,10 @@ public class PostkfModel extends BaseModel { private Map jbzl; //损伤康复 private Map sskf; + + //检查化验 + private Map jchy; + //胃肠功能减退 private Map wcgnjt; //尿失禁 @@ -68,6 +72,14 @@ public class PostkfModel extends BaseModel { private String operaterId; + public Map getJchy() { + return jchy; + } + + public void setJchy(Map jchy) { + this.jchy = jchy; + } + public String getId() { return id; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java index 34f211c..00cd01b 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java @@ -26,7 +26,7 @@ public class ResidentsArchiveModel extends BaseModel { //性别 private String sex; //出生日期 - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + //@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date birthday; //国籍 private String countryId; 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 834af31..8fe874e 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 @@ -652,7 +652,7 @@ public class LhxfyService { Map data = new HashMap<>(); Query query = new Query(); - Date start = DateUtil.addDay(new Date(),-10); + Date start = DateUtil.addDay(new Date(),-3); query.addCriteria(Criteria.where("fillDate").gte(start)); List preEugenicsBaseModels = mongoTemplate.find(query, PreEugenicsBaseModel.class); 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 ab604f2..e8d4e13 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 @@ -4609,6 +4609,7 @@ public class TestController extends BaseController { cancerScreenService.doSyncCancerScreen(); cervicalCancerService.doSyncCervicalCancer(); premaritalCheckupFacade.doSyncPremaritalCheckup(); + residentsArchiveFacade.doSyncLhfyHis(); return "success"; } @Autowired diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 9e6b923..82bc838 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -2727,7 +2727,7 @@ public class MatDeliverFacade { // 这里就设置分页内容 childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo()); } - else if (childbirthManagerRequest.getType() != null && childbirthManagerRequest.getStatus() != null) + else if ((childbirthManagerRequest.getType() != null && childbirthManagerRequest.getStatus() != null) || StringUtils.isNotEmpty(childbirthManagerRequest.getGcdfDoctorId())) { if (StringUtils.isEmpty(childbirthManagerRequest.getQueryNo())) { @@ -2742,43 +2742,48 @@ public class MatDeliverFacade { // 什么都不做，这里是数据传入错误了 } } - //产后复查状态评估查询 - int days = 0; - switch (childbirthManagerRequest.getStatus()) + if (childbirthManagerRequest.getType() != null && childbirthManagerRequest.getStatus() != null) { - case 1: - days = 3; - break; - case 2: - days = 7; - break; - case 3: - days = 14; - break; - case 4: - days = 28; - break; - case 5: - days = 42; - break; - } + //产后复查状态评估查询 + int days = 0; + switch (childbirthManagerRequest.getStatus()) + { + case 1: + days = 3; + break; + case 2: + days = 7; + break; + case 3: + days = 14; + break; + case 4: + days = 28; + break; + case 5: + days = 42; + break; + } - Date date = DateUtil.addDay(new Date(),-days); - //1 应评估 2 已评估 - List status = new ArrayList<>(); - status.add(childbirthManagerRequest.getStatus()); - if (childbirthManagerRequest.getType() == 1) - { - matDeliverQuery.setStatus(status); - matDeliverQuery.setIsStatus(false); - matDeliverQuery.setEndStart(date); - matDeliverQuery.setNeEnd(true); - } - else - { - matDeliverQuery.setStatus(status); - matDeliverQuery.setIsStatus(true); + Date date = DateUtil.addDay(new Date(),-days); + //1 应评估 2 已评估 + List status = new ArrayList<>(); + status.add(childbirthManagerRequest.getStatus()); + if (childbirthManagerRequest.getType() == 1) + { + matDeliverQuery.setStatus(status); + matDeliverQuery.setIsStatus(false); + matDeliverQuery.setEndStart(date); + matDeliverQuery.setNeEnd(true); + } + else + { + matDeliverQuery.setStatus(status); + matDeliverQuery.setIsStatus(true); + } } + + matDeliverQuery.setGcdfDoctorId(childbirthManagerRequest.getGcdfDoctorId()); matDeliverQuery.setFmHospital(hid); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostkfFaccade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostkfFaccade.java index 74432f0..c00f324 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostkfFaccade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostkfFaccade.java @@ -232,11 +232,14 @@ public class PostkfFaccade { MaternalDeliverModel maternalDeliverModel = list2.get(0); info.put("fmDate",maternalDeliverModel.getDueDate()); try { - info.put("fmDoctor", usersService.getUsers(Integer.parseInt(maternalDeliverModel.getDeliverDoctor())).getName()); + if (StringUtils.isNotEmpty(maternalDeliverModel.getGcdfDoctorId())) + { + info.put("fmDoctor", usersService.getUsers(Integer.parseInt(maternalDeliverModel.getGcdfDoctorId())).getName()); + } } catch (Exception e) { - info.put("fmDoctor", maternalDeliverModel.getDeliverDoctor()); + info.put("fmDoctor", ""); } Patients patients = patientsService.findOnePatientById(maternalDeliverModel.getParentId()); if (patients != null) 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 9516560..85bdf19 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 @@ -1278,5 +1278,13 @@ public class ResidentsArchiveFacade { } + public BaseResponse doSyncLhfyHis() { + + String doSyncLhfyHis = HttpClientUtil.doGet(AREA_URL + "/syncResidents", new HashMap(),"utf-8",""); + System.out.println("doSyncLhfyHis="+doSyncLhfyHis); + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + + public static final String AREA_URL = PropertiesUtils.getPropertyValue("area_url"); }