jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 89af4531dbc880babf44e7efc513524a54ed99ab

Authored by yangfei
2 parents b6afd1f285 bd5098320f
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 6 changed files

platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyFmService.java View file @ 89af453
... ... @@ -65,7 +65,7 @@
65 65  
66 66 private static Map<String, List> babyMap = new HashMap<>();
67 67  
68   - private static final String HOSPITALID = PropertiesUtils.getPropertyValue("hospitalId");
  68 + private static final String HOSPITALID = "1000000114";
69 69 static {
70 70 ONE_ENUMS.put(0, "长");
71 71 ONE_ENUMS.put(1, "次");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveRecordController.java View file @ 89af453
... ... @@ -157,5 +157,18 @@
157 157 }
158 158  
159 159  
  160 + /**
  161 + * 获取编辑数据
  162 + * @param id
  163 + * @return
  164 + */
  165 + @RequestMapping(value = "/getSieveEditPatient", method = RequestMethod.GET)
  166 + @ResponseBody
  167 + @TokenRequired
  168 + public BaseObjectResponse getSieveEditPatient(@RequestParam("id") String id) {
  169 + return sieveRecordFacade.getSieveEditPatient(id);
  170 + }
  171 +
  172 +
160 173 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ 89af453
... ... @@ -1215,7 +1215,7 @@
1215 1215 }
1216 1216  
1217 1217  
1218   - private PregnantInfoResult getResult(Patients p) {
  1218 + public PregnantInfoResult getResult(Patients p) {
1219 1219 PregnantInfoResult result = new PregnantInfoResult();
1220 1220 result.setMensStartDay(p.getMensStartDay());
1221 1221 result.setMensEndDay(p.getMensEndDay());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveRecordFacade.java View file @ 89af453
... ... @@ -15,6 +15,7 @@
15 15 import com.lyms.platform.operate.web.request.CqSieveQueryRequest;
16 16 import com.lyms.platform.operate.web.request.SieveAddRequest;
17 17 import com.lyms.platform.operate.web.request.YunBookbuildingAddRequest;
  18 +import com.lyms.platform.operate.web.result.PregnantInfoResult;
18 19 import com.lyms.platform.operate.web.result.SieveDetailResult;
19 20 import com.lyms.platform.operate.web.result.SieveListResult;
20 21 import com.lyms.platform.operate.web.result.SieveResult;
... ... @@ -81,8 +82,17 @@
81 82 public BaseResponse saveSieveRecord(YunBookbuildingAddRequest requestModel, Integer userId) {
82 83 try {
83 84 SieveRecordModel model = getPatientsData(requestModel);
84   - model.setOperUserId(userId);
85   - sieveRecordService.save(model);
  85 + //id不为空就修改记录
  86 + if (StringUtils.isNotEmpty(requestModel.getId()))
  87 + {
  88 + sieveRecordService.update(model,requestModel.getId());
  89 + }
  90 + else
  91 + {
  92 + model.setOperUserId(userId);
  93 + sieveRecordService.save(model);
  94 + }
  95 +
86 96 }
87 97 catch (Exception e)
88 98 {
... ... @@ -262,6 +272,7 @@
262 272 map.put("username",model.getUsername()); //用户名称
263 273 map.put("vcCardNo",model.getVcCardNo()); //就诊卡号
264 274 map.put("cardNo",model.getCardNo()); //证件号
  275 + map.put("certeTypeId",model.getPcerteTypeId()); //证件类型
265 276 map.put("phone",model.getPhone());//手机号码
266 277 map.put("birth",DateUtil.getyyyy_MM_dd(model.getBirth())); //出生日期
267 278 map.put("age",DateUtil.getAge(model.getBirth(), model.getCreated())); //年龄
... ... @@ -269,7 +280,8 @@
269 280 map.put("currentDueWeek",DateUtil.getWeekDesc(model.getLastMenses(), model.getCreated())); //当前孕周
270 281 map.put("dueDate",DateUtil.getyyyy_MM_dd(model.getDueDate())); //预产期
271 282 map.put("created",DateUtil.gety_m_dhm(model.getCreated()));//创建日期
272   - map.put("status",model.getStatus() == 0 ? "未导出" : "已导出");//导出状态
  283 + map.put("status",model.getStatus());//导出状态
  284 + map.put("statusStr",model.getStatus() == 0 ? "未导出" : "已导出");//导出状态
273 285 result.add(map);
274 286 }
275 287 }
... ... @@ -311,7 +323,6 @@
311 323 cnames.put("currentDueWeek","当前孕周"); //当前孕周
312 324 cnames.put("dueDate","预产期"); //预产期
313 325 cnames.put("created","创建日期");//创建日期
314   - cnames.put("status","导出状态");//导出状态
315 326 response.setContentType("application/octet-stream");
316 327 response.setCharacterEncoding("UTF-8");
317 328 response.setHeader("Content-Disposition", "attachment;fileName=datas.xls");
... ... @@ -380,6 +391,25 @@
380 391 br.setErrorcode(ErrorCodeConstants.SUCCESS);
381 392 br.setErrormsg("成功");
382 393 return br;
  394 + }
  395 +
  396 + public BaseObjectResponse getSieveEditPatient(String id) {
  397 + SieveRecordQuery query = new SieveRecordQuery();
  398 + query.setYn(YnEnums.YES.getId());
  399 + query.setId(id);
  400 + query.setStatus(0);
  401 + PregnantInfoResult result = new PregnantInfoResult();
  402 + List<SieveRecordModel> list = sieveRecordService.query(query);
  403 + if (list != null && list.size() > 0) {
  404 + Patients p = list.get(0);
  405 + result = bookbuildingFacade.getResult(p);
  406 + }
  407 +
  408 + BaseObjectResponse objectResponse = new BaseObjectResponse();
  409 + objectResponse.setData(result);
  410 + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
  411 + objectResponse.setErrormsg("成功");
  412 + return objectResponse;
383 413 }
384 414 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java View file @ 89af453
... ... @@ -281,6 +281,8 @@
281 281 dayWeights = pw.getDayWeights();
282 282 }
283 283 dayWeights.put(DateUtil.getyyyy_MM_dd(new Date()), nowWeight);
  284 + pw.setNowWeight(nowWeight);
  285 + pw.setBmi(getBmi(patientWeight.getNowWeight(), pw.getBeforeHeight()));
284 286 pw.setDayWeights(dayWeights);
285 287 if(patients != null && StringUtils.isNotEmpty(nowWeight)) {
286 288 weights.put(DateUtil.getWeek(patients.getLastMenses(), new Date()), nowWeight);
platform-operate-api/src/main/resources/config.properties View file @ 89af453
1 1 #短信中心url
2   -#center_base_url=http://sms.healthbaby.com.cn/v1/
3   -center_base_url=http://sms.api.stage.platform.healthbaby.com.cn/v1/
  2 +#center_base_url=https://weixin-push-save.healthbaby.com.cn
  3 +center_base_url=https://push.stage.platform.healthbaby.com.cn
4 4  
5 5 #德州代金券地址
6 6 djq_url=http://127.0.0.1:9090/his/insertDzfyDjq
7   -
8   -#各个医院ID 216：秦皇岛妇幼保健院；1000000114：德州妇幼
9   -hospitalId=1000000114
10 7  
11 8 #区域平台访问短信中心的token
12 9 center_token=e0c56363-00d6-42ee-bbe0-23c553583062