jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 23128652e2c0947abad142ce3f6efd205eb9b982

Authored by zhangchao
2 parents c05a794b08 2ac03765f0
Exists in luanping

Merge branch 'luanping' of https://git.healthbaby.com.cn/jiangjiazhi/regional-platform into luanping

Showing 4 changed files

platform-common/src/main/java/com/lyms/platform/common/enums/ChildCareEnums.java View file @ 2312865
... ... @@ -137,6 +137,49 @@
137 137 this.name = name;
138 138 }
139 139 }
  140 + public enum JCTCEnums3 {
  141 + A(1, "1月龄"),
  142 + B(2, "2月龄"),
  143 + C(3, "3月龄"),
  144 + D(4, "4月龄"),
  145 + E(5, "5月龄"),
  146 + F(6, "6月龄"),
  147 + G(8, "8月龄"),
  148 + H(9, "9月龄"),
  149 + I(10, "10月龄"),
  150 + J(12, "12月龄"),
  151 + K(18, "18月龄"),
  152 + L(24, "24月龄"),
  153 + M(30, "30月龄"),
  154 + N(36, "36月龄"),
  155 + O(48, "4岁"),
  156 + P(60, "5岁"),
  157 + Q(72, "6岁");
  158 +
  159 + private int id;
  160 + private String name;
  161 +
  162 + JCTCEnums3(int id, String name) {
  163 + this.id = id;
  164 + this.name = name;
  165 + }
  166 +
  167 + public int getId() {
  168 + return id;
  169 + }
  170 +
  171 + public void setId(int id) {
  172 + this.id = id;
  173 + }
  174 +
  175 + public String getName() {
  176 + return name;
  177 + }
  178 +
  179 + public void setName(String name) {
  180 + this.name = name;
  181 + }
  182 + }
140 183  
141 184 public enum CNQKEnums {
142 185 A(1, "好"),
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java View file @ 2312865
... ... @@ -377,5 +377,13 @@
377 377 return baseResponse;
378 378 }
379 379  
  380 + /**
  381 + 高危儿五色管理
  382 + */
  383 + @RequestMapping(method = RequestMethod.GET, value = "/patSer/findNewerChildRisk")
  384 + @ResponseBody
  385 + public BaseResponse findNewerChildRisk() {
  386 + return patientServiceFacade.findNewerChildRisk();
  387 + }
380 388 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 2312865
... ... @@ -3378,7 +3378,13 @@
3378 3378 List qbType = QbTypeEnums.getQbTypeEnums();
3379 3379 map.put("qbType", qbType);
3380 3380  
3381   - if ("2100001605".equals(hospitalId))
  3381 + if ("2100001377".equals(hospitalId))
  3382 + {
  3383 + //滦平定制 月龄套餐
  3384 + List jctc3 = EnumUtil.toJson(ChildCareEnums.JCTCEnums3.class);
  3385 + map.put("jctc", jctc3);
  3386 + }
  3387 + else if ("2100001605".equals(hospitalId))
3382 3388 {
3383 3389 //隆化定制 月龄套餐
3384 3390 List jctc2 = EnumUtil.toJson(ChildCareEnums.JCTCEnums2.class);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java View file @ 2312865
... ... @@ -29,7 +29,6 @@
29 29 import org.springframework.beans.factory.annotation.Autowired;
30 30 import org.springframework.stereotype.Component;
31 31  
32   -import javax.annotation.Resource;
33 32 import java.util.*;
34 33  
35 34 /**
... ... @@ -73,6 +72,8 @@
73 72  
74 73 private static List<BasicConfig> tiRuoBasicConfigList;
75 74  
  75 + private static List<BasicConfig> mainBasicConfigList2;
  76 +
76 77 @Autowired
77 78 private TServiceTimeRecordService serviceTimeRecordService;
78 79  
... ... @@ -1447,5 +1448,24 @@
1447 1448 // }
1448 1449 }
1449 1450  
  1451 + /**
  1452 + * 获取高危儿五色管理
  1453 + *
  1454 + * @return
  1455 + */
  1456 + public BaseResponse findNewerChildRisk() {
  1457 + if (CollectionUtils.isEmpty(mainBasicConfigList2)) {
  1458 + BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
  1459 + basicConfigQuery.setEnable(1);
  1460 + basicConfigQuery.setTypeId("fb43fd6a-b152-4cb9-9181-c46f5612ba44");
  1461 + //所有数据
  1462 + List<BasicConfig> basicConfigList = basicConfigService.queryBasicConfig(basicConfigQuery);
  1463 + mainBasicConfigList2 = basicConfigService.queryBasicConfig(basicConfigQuery);
  1464 + BasicConfigFacade.dispNewHighRisk(basicConfigList, mainBasicConfigList2);
  1465 + }
  1466 + BaseResponse baseResponse = new BaseResponse();
  1467 + baseResponse.setObject(mainBasicConfigList2);
  1468 + return baseResponse;
  1469 + }
1450 1470 }