liquanyu / regional-platform

Download as
Browse Code »

Commit 7357e35276c77e562d78b4ec08e1ee8225f15edd

Authored by yangfei
1 parent 16ea95a865
Exists in master and in 1 other branch dev

听筛模块增加

Showing 6 changed files with 55 additions and 11 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 7357e35
... ... @@ -1396,8 +1396,8 @@
1396 1396 map.put("serviceStatus", serviceStatus);
1397 1397  
1398 1398 //医院
1399   - List hospitals = antenatalExaminationFacade.convert();
1400   - map.put("hospitals", hospitals);
  1399 + // List hospitals = antenatalExaminationFacade.convert();
  1400 + // map.put("hospitals", hospitals);
1401 1401  
1402 1402 //分娩方式
1403 1403 List fmType = FmTypeEnums.getFmTypeEnums();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java View file @ 7357e35
... ... @@ -1447,7 +1447,16 @@
1447 1447 if (babyEarBase.getNation() != null) {
1448 1448 babyEarBaseView.setNation(mongoUtil.findName(babyEarBase.getNation()));
1449 1449 }
1450   -
  1450 + if (StringUtils.isNotEmpty(babyEarBase.getDeliverOrg())) {
  1451 + try {
  1452 + Organization organization = organizationService.getOrganization(Integer.parseInt(babyEarBase.getDeliverOrg()));
  1453 + if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
  1454 + babyEarBaseView.setDeliverOrg(organization.getName());
  1455 + }
  1456 + } catch (Exception e) {
  1457 + babyEarBaseView.setDeliverOrg(babyEarBase.getDeliverOrg());
  1458 + }
  1459 + }
1451 1460 String docotorId = babyEarBase.getCreateUserId();
1452 1461 if (NumberUtils.isNumber(docotorId)) {
1453 1462 Users users = usersService.getUsers(Integer.parseInt(docotorId == null ? "0" : docotorId));
1454 1463  
... ... @@ -1799,9 +1808,13 @@
1799 1808 List serviceStatus = ServiceStatusEnums.getServiceStatusList();
1800 1809 map.put("serviceStatus", serviceStatus);
1801 1810  
  1811 + //流产方式
  1812 + List abortion = InitDataUtils.getAbortionEnums();
  1813 + map.put("liuchan", abortion);
  1814 +
1802 1815 //医院
1803   - List hospitals = InitDataUtils.getAbortionEnums();
1804   - map.put("liuchan", hospitals);
  1816 + List hospitals = antenatalExaminationFacade.convert();
  1817 + map.put("hospitals", hospitals);
1805 1818  
1806 1819 //分娩方式
1807 1820 List fmType = FmTypeEnums.getHdFmEnums();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java View file @ 7357e35
... ... @@ -731,8 +731,7 @@
731 731 patientMarkHospQuery.setSort("hospit_date");
732 732 patientMarkHospQuery.setNeed("y");
733 733 patientMarkHospQuery.setOffset(offset);
734   - patientMarkHospQuery.setLimit(2);
735   - patientMarkHospQuery.setPage(page);
  734 + patientMarkHospQuery.setLimit(100);
736 735  
737 736 List<PatientMarkHospital> patientMarkHospitals = patientMarkHospitalService.queryPatientMarkHospital(patientMarkHospQuery);
738 737 for (PatientMarkHospital ps : patientMarkHospitals) {
... ... @@ -741,8 +740,8 @@
741 740 }
742 741 synUpdateHisData(ps);
743 742 }
744   - if (patientMarkHospQuery.getCount() > page * 2) {
745   - synLlHisData((page + 1) * 2, page + 1);
  743 + if (patientMarkHospQuery.getCount() > page * 100) {
  744 + synLlHisData((page + 1) * 100, page + 1);
746 745 }
747 746 }
748 747  
... ... @@ -754,7 +753,17 @@
754 753 public void synUpdateHisData(PatientMarkHospital ps) {
755 754 Patients patients = patientsService.findOnePatientById(ps.getPatientId());
756 755 if (null != patients) {
757   - List<Map<String, String>> makePatients = llfyHisService.getPatientInfo(patients, DateUtil.getyyyy_MM_dd(ps.getMakeDate()), DateUtil.getyyyy_MM_dd(new Date()));
  756 + //住院结束时间
  757 + Date hospitEndDate = null;
  758 + if(ps.getInHospitMakeDate()!=null){
  759 + hospitEndDate = ps.getInHospitMakeDate();
  760 + }else if(ps.getBackMakeDate()!=null){
  761 + hospitEndDate = ps.getBackMakeDate();
  762 + }else{
  763 + hospitEndDate = ps.getMakeInHospitDate();
  764 + }
  765 +
  766 + List<Map<String, String>> makePatients = llfyHisService.getPatientInfo(patients, DateUtil.getyyyy_MM_dd(ps.getMakeDate()), DateUtil.getyyyy_MM_dd(hospitEndDate));
758 767 if (CollectionUtils.isNotEmpty(makePatients)) {
759 768 for (Map<String, String> map : makePatients) {
760 769 String inHospDiagn = map.get("inHospDiagn");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java View file @ 7357e35
... ... @@ -43,6 +43,8 @@
43 43 private String address;
44 44 //邮编号码
45 45 private String postCode;
  46 + //助产机构
  47 + private String deliverOrg;
46 48  
47 49 /**
48 50 * 母亲基本信息
... ... @@ -136,6 +138,7 @@
136 138 setAreaId(babyModel.getAreaId());
137 139 setStreetId(babyModel.getStreetId());
138 140 setAddress(babyModel.getAddress());
  141 + setDeliverOrg(babyModel.getDeliverOrg());
139 142 setVcCardNo(babyModel.getVcCardNo());
140 143 setServiceType(babyModel.getServiceType());
141 144 setServiceStatus(babyModel.getServiceStatus());
... ... @@ -170,6 +173,7 @@
170 173 @Override
171 174 public BabyModel convertToDataModel() {
172 175 BabyModel babyModel = new BabyModel();
  176 + babyModel.setDeliverOrg(deliverOrg);
173 177 babyModel.setMname(mname);
174 178 babyModel.setMphone(mphone);
175 179 babyModel.setMbirth(DateUtil.parseYMD(mbirth));
... ... @@ -526,6 +530,14 @@
526 530  
527 531 public String getFphone() {
528 532 return fphone;
  533 + }
  534 +
  535 + public String getDeliverOrg() {
  536 + return deliverOrg;
  537 + }
  538 +
  539 + public void setDeliverOrg(String deliverOrg) {
  540 + this.deliverOrg = deliverOrg;
529 541 }
530 542  
531 543 public void setFphone(String fphone) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyEarBaseView.java View file @ 7357e35
... ... @@ -26,6 +26,8 @@
26 26 private String residence;
27 27 //邮编
28 28 private String zipCode;
  29 + //助产机构
  30 + private String deliverOrg;
29 31  
30 32 /**
31 33 * 母亲信息
... ... @@ -97,6 +99,14 @@
97 99 private String serviceStatus;
98 100 //备注
99 101 private String remark;
  102 +
  103 + public String getDeliverOrg() {
  104 + return deliverOrg;
  105 + }
  106 +
  107 + public void setDeliverOrg(String deliverOrg) {
  108 + this.deliverOrg = deliverOrg;
  109 + }
100 110  
101 111 public String getId() {
102 112 return id;
platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml View file @ 7357e35
... ... @@ -20,7 +20,7 @@
20 20 <property name="arguments">
21 21 <list>
22 22 <value>0</value>
23   - <value>1</value>
  23 + <value>0</value>
24 24 </list>
25 25 </property>
26 26 <!-- 是否并发,false表示 如果发生错误也不影响下一次的调用 -->