liquanyu / regional-platform

Download as
Browse Code »

Commit 7ed0970dad47fd7bbc49252cfcb0b77d9825612f

Authored by jiangjiazhi
2 parents 4a3a1125b5 28cefb4bc0
Exists in master and in 1 other branch dev

Merge remote-tracking branch 'origin/master'

Showing 6 changed files

platform-common/src/main/java/com/lyms/platform/common/enums/BloodSugarEnums2.java View file @ 7ed0970
  1 +package com.lyms.platform.common.enums;
  2 +
  3 +/**
  4 + * 血糖时间段枚举
  5 + */
  6 +public enum BloodSugarEnums2 {
  7 +
  8 + A(1, "空腹"), B(2, "早餐前"), C(3, "早餐后2h"), D(4, "午餐前"), E(5, "午餐后2h"), F(6, "晚餐前"), G(7, "晚餐后2h") ,H(8, "夜间"), I(9, "睡前");
  9 +
  10 + BloodSugarEnums2(Integer id, String name) {
  11 + this.id = id;
  12 + this.name = name;
  13 + }
  14 +
  15 + private Integer id;
  16 + private String name;
  17 +
  18 + public static String getName(Integer id) {
  19 + if(id == null) {
  20 + return null;
  21 + }
  22 + BloodSugarEnums2[] values = BloodSugarEnums2.values();
  23 + for (BloodSugarEnums2 value : values) {
  24 + if (value.getId() == id) {
  25 + return value.getName();
  26 + }
  27 + }
  28 + return null;
  29 + }
  30 +
  31 + public Integer getId() {
  32 + return id;
  33 + }
  34 +
  35 + public void setId(Integer id) {
  36 + this.id = id;
  37 + }
  38 +
  39 + public String getName() {
  40 + return name;
  41 + }
  42 +
  43 + public void setName(String name) {
  44 + this.name = name;
  45 + }
  46 +}
platform-operate-api/src/main/java/com/lyms/hospitalapi/zcfy/ZcfyHisService.java View file @ 7ed0970
... ... @@ -63,7 +63,7 @@
63 63 * @param vcCardNo
64 64 * @return
65 65 */
66   - public List<String> getDzVcCardNos(String vcCardNo)
  66 + public List<String> getZcVcCardNos(String vcCardNo)
67 67 {
68 68 List<String> vcCardNos = new ArrayList<>();
69 69 List<DzReplace> list = findAllVcCarddNo(vcCardNo);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java View file @ 7ed0970
... ... @@ -3,6 +3,7 @@
3 3 import com.lyms.hospitalapi.Cdfy.CdfyHisService;
4 4 import com.lyms.hospitalapi.Nczxyy.NczxyyLisService;
5 5 import com.lyms.hospitalapi.dzfy.DzfyHisService;
  6 +import com.lyms.hospitalapi.zcfy.ZcfyHisService;
6 7 import com.lyms.hospitalapi.pojo.CheckByDate;
7 8 import com.lyms.hospitalapi.pojo.CheckItemResponse;
8 9 import com.lyms.hospitalapi.pojo.CheckResponse;
... ... @@ -64,6 +65,9 @@
64 65 private DzfyHisService dzfyHisService;
65 66  
66 67 @Autowired
  68 + private ZcfyHisService zcfyHisService;
  69 +
  70 + @Autowired
67 71 private CdfyHisService cdfyHisService;
68 72  
69 73 @Autowired
... ... @@ -472,7 +476,8 @@
472 476 //诸城
473 477 else if ("21".equals(HIS_VERSION))
474 478 {
475   - model.setVcCardNo(getZcVcardNo(vcCardNo));
  479 + //model.setVcCardNo(getZcVcardNo(vcCardNo));
  480 + model.setVcCardNos(zcfyHisService.getZcVcCardNos(vcCardNo));
476 481 }
477 482 else
478 483 {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java View file @ 7ed0970
... ... @@ -17,6 +17,17 @@
17 17  
18 18 private String genRemark; // 一般检查备注
19 19  
  20 + //该字段是针对聊城东昌区妇幼保健医院保存当天孕妇的lis检查项
  21 + private String lisCheckItems;
  22 +
  23 + public String getLisCheckItems() {
  24 + return lisCheckItems;
  25 + }
  26 +
  27 + public void setLisCheckItems(String lisCheckItems) {
  28 + this.lisCheckItems = lisCheckItems;
  29 + }
  30 +
20 31 public String getGenRemark() {
21 32 return genRemark;
22 33 }
... ... @@ -336,6 +347,7 @@
336 347 setTireData(destModel.getTireData());
337 348 setType(destModel.getType());
338 349 setTypeYc(destModel.getTypeYc());
  350 + setLisCheckItems(destModel.getLisCheckItems());
339 351 return this;
340 352 }
341 353  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java View file @ 7ed0970
... ... @@ -18,6 +18,19 @@
18 18 private String genRemark; // 一般检查备注
19 19 private String gynRemark; // 妇科检查备注
20 20  
  21 +
  22 + //该字段是针对聊城东昌区妇幼保健医院保存当天孕妇的lis检查项
  23 + private String lisCheckItems;
  24 +
  25 + public String getLisCheckItems() {
  26 + return lisCheckItems;
  27 + }
  28 +
  29 + public void setLisCheckItems(String lisCheckItems) {
  30 + this.lisCheckItems = lisCheckItems;
  31 + }
  32 +
  33 +
21 34 public String getGenRemark() {
22 35 return genRemark;
23 36 }
... ... @@ -1426,6 +1439,7 @@
1426 1439 setYljzxs(antExChuModel.getYljzxs());
1427 1440 setJzxgyhwmkt(antExChuModel.getJzxgyhwmkt());
1428 1441 setEdema(antExChuModel.getEdema());
  1442 + setLisCheckItems(antExChuModel.getLisCheckItems());
1429 1443  
1430 1444 }
1431 1445 return this;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java View file @ 7ed0970
... ... @@ -4,6 +4,7 @@
4 4 import com.alibaba.fastjson.JSONObject;
5 5 import com.lyms.platform.biz.service.BloodSugarService;
6 6 import com.lyms.platform.common.enums.BloodSugarEnums;
  7 +import com.lyms.platform.common.enums.BloodSugarEnums2;
7 8 import com.lyms.platform.common.enums.YnEnums;
8 9 import com.lyms.platform.common.result.BaseResponse;
9 10 import com.lyms.platform.common.result.PageResult;
10 11  
11 12  
... ... @@ -140,20 +141,20 @@
140 141 if(CollectionUtils.isNotEmpty(bloodSugars)) {
141 142 for (int i = 0; i < betweenDay.size(); i++) {
142 143 String day = betweenDay.get(i);
143   - Map<Object, Object> temp = new HashMap<>();
  144 + Map<Object, Object> temp = new LinkedHashMap<>();
144 145 for (BloodSugar bloodSugar : bloodSugars) {
145 146 if(day.equals(bloodSugar.getCreatYmdDate())) {
146 147 if(type == bloodSugar.getBloodSugarType()) {
147 148 bloodSugarAxis.add(0, bloodSugar.getBloodSugar());
148 149 }
149   - for (BloodSugarEnums sugarEnums : BloodSugarEnums.values()) {
  150 + for (BloodSugarEnums2 sugarEnums : BloodSugarEnums2.values()) {
150 151 if(sugarEnums.getId() == (bloodSugar.getBloodSugarType())) {
151 152 temp.put(sugarEnums.getId(), bloodSugar.getBloodSugar());
152 153 }
153 154 }
154 155 }
155 156 }
156   - for (BloodSugarEnums sugarEnums : BloodSugarEnums.values()) {
  157 + for (BloodSugarEnums2 sugarEnums : BloodSugarEnums2.values()) {
157 158 if(!temp.containsKey(sugarEnums.getId())) {
158 159 temp.put(sugarEnums.getId(), "--");
159 160 }
... ... @@ -201,7 +202,7 @@
201 202  
202 203 @Override
203 204 public BaseResponse init() {
204   - return RespBuilder.buildSuccess(EnumUtil.toJson(BloodSugarEnums.class));
  205 + return RespBuilder.buildSuccess(EnumUtil.toJson(BloodSugarEnums2.class));
205 206 }
206 207  
207 208 @Override
... ... @@ -255,7 +256,8 @@
255 256 Date date = new Date();
256 257 List<Map<String, Object>> weekAvgMap = new ArrayList<>();
257 258 Map<Integer, Map<String, Object>> weekAvgMapTemp = new LinkedHashMap<>();
258   - Date weekStart = DateUtil.addWeek(date, -1);
  259 + Date weekStart = DateUtil.getYmdDate(DateUtil.addDay(DateUtil.addWeek(date, -1), 1));
  260 + System.out.println(weekStart.toLocaleString());
259 261 List<BloodSugar> bloodSugarsWeek = mongoTemplate.find(Query.query(Criteria.where("pid").is(parentId).and("created").gte(weekStart)).with(new Sort(Sort.Direction.DESC, "created")), BloodSugar.class);
260 262 for (BloodSugar bloodSugar : bloodSugarsWeek) {
261 263 if(weekAvgMapTemp.containsKey(bloodSugar.getBloodSugarType())) {
... ... @@ -292,7 +294,8 @@
292 294 // 月平均
293 295 List<Map<String, Object>> monthAvgMap = new ArrayList<>();
294 296 Map<Integer, Map<String, Object>> monthAvgTemp = new LinkedHashMap<>();
295   - Date monthStart = DateUtil.addMonth(date, -1);
  297 +// Date monthStart = DateUtil.addMonth(date, -1);
  298 + Date monthStart = DateUtil.getYmdDate(DateUtil.addDay(DateUtil.addMonth(date, -1), 1));
296 299 List<BloodSugar> bloodSugarsMonth = mongoTemplate.find(Query.query(Criteria.where("pid").is(parentId).and("created").gte(monthStart)).with(new Sort(Sort.Direction.DESC, "created")), BloodSugar.class);
297 300 for (BloodSugar bloodSugar : bloodSugarsMonth) {
298 301 if(monthAvgTemp.containsKey(bloodSugar.getBloodSugarType())) {