liquanyu / regional-platform

Download as
Browse Code »

Commit 997d65a2a722ae340b27d4df3f4c54d76c9168ac

Authored by liquanyu
1 parent 70720f66a5
Exists in master and in 1 other branch dev

update

Showing 7 changed files with 68 additions and 39 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/PostkfModel.java View file @ 997d65a
... ... @@ -27,6 +27,10 @@
27 27 private Map<String,Object> jbzl;
28 28 //损伤康复
29 29 private Map<String,Object> sskf;
  30 +
  31 + //检查化验
  32 + private Map<String,Object> jchy;
  33 +
30 34 //胃肠功能减退
31 35 private Map<String,Object> wcgnjt;
32 36 //尿失禁
... ... @@ -67,6 +71,14 @@
67 71 private Date modified;
68 72  
69 73 private String operaterId;
  74 +
  75 + public Map<String, Object> getJchy() {
  76 + return jchy;
  77 + }
  78 +
  79 + public void setJchy(Map<String, Object> jchy) {
  80 + this.jchy = jchy;
  81 + }
70 82  
71 83 public String getId() {
72 84 return id;
platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java View file @ 997d65a
... ... @@ -26,7 +26,7 @@
26 26 //性别
27 27 private String sex;
28 28 //出生日期
29   - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
  29 + //@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
30 30 private Date birthday;
31 31 //国籍
32 32 private String countryId;
platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java View file @ 997d65a
... ... @@ -652,7 +652,7 @@
652 652 Map<String,String> data = new HashMap<>();
653 653  
654 654 Query query = new Query();
655   - Date start = DateUtil.addDay(new Date(),-10);
  655 + Date start = DateUtil.addDay(new Date(),-3);
656 656 query.addCriteria(Criteria.where("fillDate").gte(start));
657 657  
658 658 List <PreEugenicsBaseModel> preEugenicsBaseModels = mongoTemplate.find(query, PreEugenicsBaseModel.class);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java View file @ 997d65a
... ... @@ -4609,6 +4609,7 @@
4609 4609 cancerScreenService.doSyncCancerScreen();
4610 4610 cervicalCancerService.doSyncCervicalCancer();
4611 4611 premaritalCheckupFacade.doSyncPremaritalCheckup();
  4612 + residentsArchiveFacade.doSyncLhfyHis();
4612 4613 return "success";
4613 4614 }
4614 4615 @Autowired
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 997d65a
... ... @@ -2727,7 +2727,7 @@
2727 2727 // 这里就设置分页内容
2728 2728 childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo());
2729 2729 }
2730   - else if (childbirthManagerRequest.getType() != null && childbirthManagerRequest.getStatus() != null)
  2730 + else if ((childbirthManagerRequest.getType() != null && childbirthManagerRequest.getStatus() != null) || StringUtils.isNotEmpty(childbirthManagerRequest.getGcdfDoctorId()))
2731 2731 {
2732 2732 if (StringUtils.isEmpty(childbirthManagerRequest.getQueryNo()))
2733 2733 {
2734 2734  
2735 2735  
2736 2736  
... ... @@ -2742,43 +2742,48 @@
2742 2742 // 什么都不做，这里是数据传入错误了
2743 2743 }
2744 2744 }
2745   - //产后复查状态评估查询
2746   - int days = 0;
2747   - switch (childbirthManagerRequest.getStatus())
  2745 + if (childbirthManagerRequest.getType() != null && childbirthManagerRequest.getStatus() != null)
2748 2746 {
2749   - case 1:
2750   - days = 3;
2751   - break;
2752   - case 2:
2753   - days = 7;
2754   - break;
2755   - case 3:
2756   - days = 14;
2757   - break;
2758   - case 4:
2759   - days = 28;
2760   - break;
2761   - case 5:
2762   - days = 42;
2763   - break;
2764   - }
  2747 + //产后复查状态评估查询
  2748 + int days = 0;
  2749 + switch (childbirthManagerRequest.getStatus())
  2750 + {
  2751 + case 1:
  2752 + days = 3;
  2753 + break;
  2754 + case 2:
  2755 + days = 7;
  2756 + break;
  2757 + case 3:
  2758 + days = 14;
  2759 + break;
  2760 + case 4:
  2761 + days = 28;
  2762 + break;
  2763 + case 5:
  2764 + days = 42;
  2765 + break;
  2766 + }
2765 2767  
2766   - Date date = DateUtil.addDay(new Date(),-days);
2767   - //1 应评估 2 已评估
2768   - List<Integer> status = new ArrayList<>();
2769   - status.add(childbirthManagerRequest.getStatus());
2770   - if (childbirthManagerRequest.getType() == 1)
2771   - {
2772   - matDeliverQuery.setStatus(status);
2773   - matDeliverQuery.setIsStatus(false);
2774   - matDeliverQuery.setEndStart(date);
2775   - matDeliverQuery.setNeEnd(true);
  2768 + Date date = DateUtil.addDay(new Date(),-days);
  2769 + //1 应评估 2 已评估
  2770 + List<Integer> status = new ArrayList<>();
  2771 + status.add(childbirthManagerRequest.getStatus());
  2772 + if (childbirthManagerRequest.getType() == 1)
  2773 + {
  2774 + matDeliverQuery.setStatus(status);
  2775 + matDeliverQuery.setIsStatus(false);
  2776 + matDeliverQuery.setEndStart(date);
  2777 + matDeliverQuery.setNeEnd(true);
  2778 + }
  2779 + else
  2780 + {
  2781 + matDeliverQuery.setStatus(status);
  2782 + matDeliverQuery.setIsStatus(true);
  2783 + }
2776 2784 }
2777   - else
2778   - {
2779   - matDeliverQuery.setStatus(status);
2780   - matDeliverQuery.setIsStatus(true);
2781   - }
  2785 +
  2786 +
2782 2787 matDeliverQuery.setGcdfDoctorId(childbirthManagerRequest.getGcdfDoctorId());
2783 2788  
2784 2789 matDeliverQuery.setFmHospital(hid);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostkfFaccade.java View file @ 997d65a
... ... @@ -232,11 +232,14 @@
232 232 MaternalDeliverModel maternalDeliverModel = list2.get(0);
233 233 info.put("fmDate",maternalDeliverModel.getDueDate());
234 234 try {
235   - info.put("fmDoctor", usersService.getUsers(Integer.parseInt(maternalDeliverModel.getDeliverDoctor())).getName());
  235 + if (StringUtils.isNotEmpty(maternalDeliverModel.getGcdfDoctorId()))
  236 + {
  237 + info.put("fmDoctor", usersService.getUsers(Integer.parseInt(maternalDeliverModel.getGcdfDoctorId())).getName());
  238 + }
236 239 }
237 240 catch (Exception e)
238 241 {
239   - info.put("fmDoctor", maternalDeliverModel.getDeliverDoctor());
  242 + info.put("fmDoctor", "");
240 243 }
241 244 Patients patients = patientsService.findOnePatientById(maternalDeliverModel.getParentId());
242 245 if (patients != null)
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java View file @ 997d65a
... ... @@ -1278,6 +1278,14 @@
1278 1278 }
1279 1279  
1280 1280  
  1281 + public BaseResponse doSyncLhfyHis() {
  1282 +
  1283 + String doSyncLhfyHis = HttpClientUtil.doGet(AREA_URL + "/syncResidents", new HashMap<String, String>(),"utf-8","");
  1284 + System.out.println("doSyncLhfyHis="+doSyncLhfyHis);
  1285 + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
  1286 + }
  1287 +
  1288 +
1281 1289 public static final String AREA_URL = PropertiesUtils.getPropertyValue("area_url");
1282 1290 }