jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 11d83080a1084cd31805d5a4b7e7377c689a9ce2

Authored by yangfei
2 parents 4abcb8a270 11756e4720
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-operate-api/src/main/java/com/lyms/hospitalapi/Nczxyy/NczxyyLisService.java View file @ 11d8308
... ... @@ -278,6 +278,7 @@
278 278 item.setRefer(nczxyyxq2.getData().getLisPatResults().get(j).get临界值());
279 279 item.setResult(nczxyyxq2.getData().getLisPatResults().get(j).get检验值());
280 280 item.setUnit(nczxyyxq2.getData().getLisPatResults().get(j).get单位());
  281 + item.setSpecial(nczxyyxq2.getData().getLisPatResults().get(j).get结论());
281 282 itemlist.add(item);
282 283 }
283 284 result.add(CheckResponse);
... ... @@ -290,10 +291,6 @@
290 291 }
291 292  
292 293 return result;
293   - }
294   - public static void main(String[] arags)
295   - {
296   - queryLisCheckList("1002291303");
297 294 }
298 295  
299 296 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 11d8308
... ... @@ -1692,7 +1692,14 @@
1692 1692 newBabyManagerQueryModel.setMphone(DefenceUtils.getPhone(babyModel.getMphone()));
1693 1693 newBabyManagerQueryModel.setBirthDays(DateUtil.getDays(babyModel.getBirth(), new Date()));
1694 1694 newBabyManagerQueryModel.setBabyId(babyModel.getId());
1695   - newBabyManagerQueryModel.setDeliverDoctor(usersService.getUsers(Integer.valueOf(maternalDeliverModel.getDeliverDoctor())).getName());
  1695 + String deliverDoctor = "";
  1696 + try {
  1697 + deliverDoctor = usersService.getUsers(Integer.valueOf(maternalDeliverModel.getDeliverDoctor())).getName();
  1698 + } catch (Exception e)
  1699 + {
  1700 + deliverDoctor = maternalDeliverModel.getDeliverDoctor();
  1701 + }
  1702 + newBabyManagerQueryModel.setDeliverDoctor(deliverDoctor);
1696 1703 newBabyManagerQueryModel.setMaternalDeliverId(maternalDeliverModel.getId());
1697 1704 newBabyManagerQueryModel.setPatientId(maternalDeliverModel.getParentId());
1698 1705 newBabyManagerQueryModel.setpId(maternalDeliverModel.getPid());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java View file @ 11d8308
... ... @@ -1039,7 +1039,7 @@
1039 1039 * 1 = 发放人数 2 = 发放券数 3 = 使用人数 4 = 使用券数
1040 1040 */
1041 1041 Integer type = (Integer) param.get("type");
1042   - if(type == null) type = 1;
  1042 + if(type == null) type = 4;
1043 1043 if(exportType == 1 && type == 1) { /** 孕期发放人数 */
1044 1044 exportPregnancy(couponInfos == null ? userSendInfos : couponInfos, response);
1045 1045 } else if(exportType == 1) { /** 孕期使用券数 */
... ... @@ -1137,6 +1137,7 @@
1137 1137 Map<String, Object> result = new LinkedHashMap<>();
1138 1138 result.put("id", ++i);
1139 1139 result.put("phone", m.get("phone"));
  1140 + result.put("use_date", m.get("use_date"));
1140 1141 result.put("username", m.get("username"));
1141 1142 result.put("week", m.get("week"));
1142 1143 result.put("type_desc", m.get("type_desc"));
... ... @@ -1220,8 +1221,8 @@
1220 1221 cnames.put("username", "姓名");
1221 1222 cnames.put("send_hospital", "发放机构");
1222 1223 cnames.put("doctoer_name", "发放医生");
1223   - cnames.put("householdAddress", "居住地");
1224   - cnames.put("residenceAddress", "户籍地");
  1224 + cnames.put("residenceAddress", "居住地");
  1225 + cnames.put("householdAddress", "户籍地");
1225 1226 cnames.put("phone", "联系电话");
1226 1227  
1227 1228 List<Map<String,Object>> results = new ArrayList<>();