fangcheng / regional-platform

Download as
Browse Code »

Commit 0aba8dfb7b4c4f436d2af18922ef14d7954df953

Authored by hujiaqi
2 parents 028b5ae19a 49372a44fd
Exists in master

Merge remote-tracking branch 'origin/master'

Showing 7 changed files

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyCheckService.java View file @ 0aba8df
... ... @@ -52,7 +52,7 @@
52 52 babyQuery.mysqlBuild(babyCheckDao.queryBabyCheckCount(babyQuery.convertToQuery()));
53 53 query.start(babyQuery.getOffset()).end(babyQuery.getLimit());
54 54 }
55   - return babyCheckDao.queryBabyCheckRecord(babyQuery.convertToQuery().addOrder(Sort.Direction.DESC,"created"));
  55 + return babyCheckDao.queryBabyCheckRecord(query.addOrder(Sort.Direction.DESC,"created"));
56 56 }
57 57  
58 58 public List<BabyCheckModel> queryBabyCheckRecord(BabyCheckModelQuery query,String sortkey,Sort.Direction sort) {
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java View file @ 0aba8df
... ... @@ -253,7 +253,7 @@
253 253 public void updateBaseData(Patients patients){
254 254 PatientsQuery patientsQuery2=new PatientsQuery();
255 255 patientsQuery2.setPid(patients.getPid());
256   - patientsQuery2.setEnable("0");
  256 + patientsQuery2.setEnable("2");
257 257 patientsQuery2.setSource(patients.getId());
258 258 //查询出其他医院的隐藏建档
259 259 List<Patients> patientses=queryPatient(patientsQuery2);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java View file @ 0aba8df
... ... @@ -757,23 +757,27 @@
757 757 {
758 758 String height = checkModel.getHeight();
759 759 String birth = DateUtil.getyyyy_MM_dd(babyModel.getBirth());
  760 + if (!com.lyms.platform.common.utils.StringUtils.isNotEmpty(birth))
  761 + {
  762 + continue;
  763 + }
760 764 // type 0 体重标准差数值表 1 身长/身高标准差数值表 2 头围标准差数值表 3身高别体重
761 765 if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(height))
762 766 {
763 767 String value = babyCheckFacade.getGrowthValue(birth,Double.parseDouble(height),babyModel.getSex(),1);
764   - checkModel.setHeadEvaluate(value);
  768 + checkModel.setHeightEvaluate(value);
765 769  
766 770 }
767 771 String head = checkModel.getHead();
768 772 if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(head)) {
769   - String value = babyCheckFacade.getGrowthValue(birth,Double.parseDouble(head),babyModel.getSex(),1);
  773 + String value = babyCheckFacade.getGrowthValue(birth,Double.parseDouble(head),babyModel.getSex(),2);
770 774 checkModel.setHeadEvaluate(value);
771 775 }
772 776  
773 777 String weight = checkModel.getWeight();
774 778 if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(weight)) {
775   - String value = babyCheckFacade.getGrowthValue(birth,Double.parseDouble(weight),babyModel.getSex(),1);
776   - checkModel.setHeadEvaluate(value);
  779 + String value = babyCheckFacade.getGrowthValue(birth,Double.parseDouble(weight),babyModel.getSex(),3);
  780 + checkModel.setWeightEvaluate(value);
777 781 }
778 782  
779 783 if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(height) &&
... ... @@ -790,6 +794,7 @@
790 794 checkModel.setHeightWeight(hw);
791 795  
792 796 }
  797 + checkModel.setHospitalId(checkModel.getHospitalId());
793 798 checkModel.setBirth(babyModel.getBirth());
794 799 babyCheckService.updateBabyCheck(checkModel,checkModel.getId());
795 800 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 0aba8df
... ... @@ -852,9 +852,9 @@
852 852 Map map = new HashMap();
853 853  
854 854 List sortList = new ArrayList();
855   - String hospital = autoMatchFacade.getHospitalId(userId);
  855 +
856 856 List<SortIn> listDate = new ArrayList();
857   - ;
  857 +
858 858 if (CollectionUtils.isNotEmpty(list)) {
859 859 // Patients patients2 = findOnePatient(null, null, null, hospital, -1, true, exListQueryRequest.getPid(),false);
860 860 Patients patients2 = findOnePatient(null, null, null, groupsFacade.findGroupHospital(userId), -1, true, exListQueryRequest.getPid(), false);
... ... @@ -1050,7 +1050,7 @@
1050 1050 organization = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId()));
1051 1051 }
1052 1052 pid = patients.getPid();
1053   - if(!"0".equals(patients.getEnable())){
  1053 + if(!"2".equals(patients.getEnable())){
1054 1054 listData.add(new AntData(patients, null != organization ? organization.getName() : ""));
1055 1055 }
1056 1056  
... ... @@ -1211,7 +1211,7 @@
1211 1211 organization = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId()));
1212 1212 }
1213 1213 pid = patients.getPid();
1214   - if(!"0".equals(patients.getEnable())) {
  1214 + if(!"2".equals(patients.getEnable())) {
1215 1215 listData.add(new AntData(patients, null != organization ? organization.getName() : ""));
1216 1216 }
1217 1217 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 0aba8df
... ... @@ -2283,6 +2283,7 @@
2283 2283 }
2284 2284 }
2285 2285 map.put("checkDoctor",checkDoctor);
  2286 + list.add(map);
2286 2287 }
2287 2288  
2288 2289 }
2289 2290  
... ... @@ -2294,13 +2295,17 @@
2294 2295 Future f = pool.submit(c);
2295 2296 futures.add(f);
2296 2297 }
2297   - for (Future f : futures) {
2298   - try {
2299   - results.addAll((List) f.get(30, TimeUnit.SECONDS));
2300   - } catch (Exception e) {
2301   - ExceptionUtils.catchException(e, "baby check list");
  2298 + if (CollectionUtils.isNotEmpty(futures))
  2299 + {
  2300 + for (Future f : futures) {
  2301 + try {
  2302 + results.addAll((List) f.get(30, TimeUnit.SECONDS));
  2303 + } catch (Exception e) {
  2304 + ExceptionUtils.catchException(e, "baby check list");
  2305 + }
2302 2306 }
2303 2307 }
  2308 +
2304 2309 }
2305 2310  
2306 2311 BaseListResponse objectResponse = new BaseListResponse();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ 0aba8df
... ... @@ -444,12 +444,7 @@
444 444 patient.setId(id);
445 445 //加入产筛
446 446 patientsService.validata(patient);
447   - //如果当前是建档医院,那么需要修改其他非建档医院的数据
448   - if (autoMatchFacade.checkBStatus(userId)) {
449   - patientsService.updateBaseData(patient);
450   - }
451 447  
452   -
453 448 PatientsQuery pQuery = new PatientsQuery();
454 449 pQuery.setYn(YnEnums.YES.getId());
455 450 pQuery.setId(id);
... ... @@ -470,7 +465,10 @@
470 465  
471 466 patient.setOperator(userId);
472 467 yunBookbuildingService.updatePregnant(patient, id);
473   -
  468 + //如果当前是建档医院,那么需要修改其他非建档医院的数据
  469 + if (autoMatchFacade.checkBStatus(userId)) {
  470 + patientsService.updateBaseData(patient);
  471 + }
474 472 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
475 473 }
476 474  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java View file @ 0aba8df
... ... @@ -54,7 +54,16 @@
54 54 private String dueDate;
55 55 //type 1 儿童建档 2 自动分娩 3 手动建档删除分娩记录
56 56 private String type;
  57 + private String pid;
57 58  
  59 + public String getPid() {
  60 + return pid;
  61 + }
  62 +
  63 + public void setPid(String pid) {
  64 + this.pid = pid;
  65 + }
  66 +
58 67 public String getType() {
59 68 return type;
60 69 }
... ... @@ -105,6 +114,7 @@
105 114 }
106 115 } catch (Exception e) {
107 116 }
  117 + setPid(patients.getPid());
108 118 if (null != patients.getLastMenses()) {
109 119 setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses()));
110 120 }