jiangjiazhi / regional-platform

Download as
Browse Code »

Commit a11bf2db97b067b1a7fd3c754ca4188ef75cb03c

Authored by zhangchao
1 parent c8191dd4e0
Exists in dev

#fix:新增体重营养报告打印逻辑判断，优化辅助医生为送检医生

Showing 6 changed files with 36 additions and 6 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java View file @ a11bf2d
... ... @@ -208,7 +208,7 @@
208 208 System.out.println("lis query patients null");
209 209 return;
210 210 }
211   -
  211 + String applyDoctor=model.getApplyDoctor();
212 212 AntExChuQuery antExChuQuery = new AntExChuQuery();
213 213 antExChuQuery.setParentId(patients.getId());
214 214 antExChuQuery.setYn(1);
215 215  
... ... @@ -376,8 +376,9 @@
376 376 }
377 377 if (b) {
378 378 System.out.println("addAntenatalExamination");
379   - addAntenatalExamination(antenatalExaminationModel, antExChuModel, patients);
  379 + addAntenatalExamination(antenatalExaminationModel, antExChuModel, patients,applyDoctor);
380 380 }
  381 +
381 382 //GLU3 60分钟血糖 GLU4 120分钟血糖 GLUCm 空腹
382 383 if (StringUtils.isNotEmpty(params.get("GLU3"))){
383 384 p=true;
... ... @@ -567,7 +568,7 @@
567 568 @Autowired
568 569 private AntExRecordService antExRecordService;
569 570  
570   - public void addAntenatalExamination(AntenatalExaminationModel antenatalExaminationModel, AntExChuModel antExChuModel, Patients patients) {
  571 + public void addAntenatalExamination(AntenatalExaminationModel antenatalExaminationModel, AntExChuModel antExChuModel, Patients patients,String applyDoctor) {
571 572 if (antenatalExaminationModel.getId() != null) {
572 573 antenatalExaminationModel.setCheckDate(new Date());
573 574 antenatalExaminationService.updateOneAnt(antenatalExaminationModel, antenatalExaminationModel.getId());
... ... @@ -587,6 +588,8 @@
587 588 antExRecordModel.setType(1);
588 589 antExRecordModel.setCheckTime(new Date());
589 590 antExRecordModel.setBuildTime(new Date());
  591 + //临时赋值用来占用字段
  592 + antExRecordModel.setCheckDoctor(applyDoctor);
590 593 if (antExRecordModel.getDueDate() != null) {
591 594 antExRecordModel.setStatus(antExRecordModel.getDueDate().compareTo(new Date()) > 0 ? 2 : 1);
592 595 antExRecordModel.setDueStatus(antExRecordModel.getStatus());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java View file @ a11bf2d
... ... @@ -145,6 +145,16 @@
145 145 public BaseResponse wxAddOrUpdateSync(PatientWeight patientWeight) {
146 146 return patientWeightService.wxAddOrUpdateSync(patientWeight);
147 147 }
  148 + /**
  149 + * 小程序查询体重管理状态
  150 + *
  151 + * @return
  152 + */
  153 + @ResponseBody
  154 + @RequestMapping(value = "/wx/serviceStatus", method = RequestMethod.GET)
  155 + public BaseResponse wxServiceStatus(String pid) {
  156 + return patientWeightService.wxServiceStatus(pid);
  157 + }
148 158  
149 159 @ResponseBody
150 160 @RequestMapping(value = "/update", method = RequestMethod.POST)
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ a11bf2d
... ... @@ -1408,7 +1408,10 @@
1408 1408 }*/else if ("11".equals(twinsType)){
1409 1409 Criteria criteria11 = Criteria.where("name").is("泌尿系统疾病：急、慢性肾脏疾病伴高血压、肾功能不全（肌酐超过正常值上限的1.5倍）");
1410 1410 yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria11));
1411   - }else {
  1411 + }else if("12".equals(twinsType)){
  1412 + Criteria criteria13 = Criteria.where("name").is("重度子痫前期、慢性高血压合并子痫前期");
  1413 + yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria13));
  1414 + }else {
1412 1415 Criteria criteria1 = Criteria.where("name").is("妊娠期高血压疾病（除外红、橙色）");
1413 1416 Criteria criteria2 = Criteria.where("name").is("妊娠期高血压");
1414 1417 Criteria criteria3 = Criteria.where("name").is("子痫前期（轻）");
... ... @@ -1421,7 +1424,8 @@
1421 1424 Criteria criteria10 = Criteria.where("name").is("慢性高血压合并子痫前期");
1422 1425 // Criteria criteria11 = Criteria.where("name").is("高血压（需要药物治疗）");
1423 1426 Criteria criteria12 = Criteria.where("name").is("泌尿系统疾病：急、慢性肾脏疾病伴高血压、肾功能不全（肌酐超过正常值上限的1.5倍）");
1424   - yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1, criteria2, criteria3, criteria4, criteria5, criteria6, criteria7,criteria8,criteria9,criteria10,criteria12));
  1427 + Criteria criteria13 = Criteria.where("name").is("重度子痫前期、慢性高血压合并子痫前期");
  1428 + yn = Query.query(Criteria.where("yn").is(1).orOperator(criteria1, criteria2, criteria3, criteria4, criteria5, criteria6, criteria7,criteria8,criteria9,criteria10,criteria12,criteria13));
1425 1429 }
1426 1430 List <BasicConfig> models = mongoTemplate.find(yn, BasicConfig.class);
1427 1431 List <String> rFactorList = new ArrayList <>();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java View file @ a11bf2d
... ... @@ -41,6 +41,8 @@
41 41  
42 42 BaseResponse wxReport(String pid);
43 43  
  44 + BaseResponse wxServiceStatus(String pid);
  45 +
44 46 BaseResponse wxAddOrUpdate(PatientWeight patientWeight);
45 47  
46 48 BaseResponse wxAddOrUpdateSync(PatientWeight patientWeight);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java View file @ a11bf2d
... ... @@ -1353,6 +1353,16 @@
1353 1353 }
1354 1354  
1355 1355 @Override
  1356 + public BaseResponse wxServiceStatus(String pid) {
  1357 + PatientServiceQuery patientServiceQuery=new PatientServiceQuery();
  1358 + patientServiceQuery.setSerType(2);
  1359 + patientServiceQuery.setPid(pid);
  1360 + patientServiceQuery.setSerEndTime(new Date());
  1361 + List<PatientService> list= patientServiceService.queryPatientService(patientServiceQuery);
  1362 + return RespBuilder.buildSuccess(list);
  1363 + }
  1364 +
  1365 + @Override
1356 1366 public BaseResponse wxAddOrUpdate(PatientWeight patientWeight) {
1357 1367 String nowWeight = patientWeight.getNowWeight();
1358 1368 Patients patients = mongoTemplate.findById(patientWeight.getPatientId(), Patients.class);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BloodPressurePatientWorker.java View file @ a11bf2d
... ... @@ -278,7 +278,8 @@
278 278 ||"慢性高血压合并子痫前期".equals(name)
279 279 //||"高血压（需要药物治疗）".equals(name)
280 280 ||"泌尿系统疾病：急、慢性肾脏疾病伴高血压、肾功能不全（肌酐超过正常值上限的1.5倍）".equals(name)
281   - ){
  281 + ||"重度子痫前期、慢性高血压合并子痫前期".equals(name)
  282 + ){
282 283 sb.append(basicConfig.getName()).append(',');
283 284 }
284 285 }