jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 10ff1ffba1b96ea04cc1bab7fa5e776017781202

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

Merge remote-tracking branch 'origin/master'

Showing 7 changed files

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ISieveDao.java View file @ 10ff1ff
... ... @@ -85,5 +85,6 @@
85 85 */
86 86 List<SieveModel> queryList(MongoQuery sieveQuery);
87 87  
  88 + void updateSieveResult(SieveResultModel model);
88 89 }
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/SieveDaoImpl.java View file @ 10ff1ff
... ... @@ -86,6 +86,16 @@
86 86 return mongoTemplate.find(sieveQuery.convertToMongoQuery(), SieveModel.class);
87 87 }
88 88  
  89 + @Override
  90 + public void updateSieveResult(SieveResultModel model) {
  91 +
  92 + model.setModified(new Date());
  93 + Update update = MongoConvertHelper
  94 + .convertToNativeUpdate(ReflectionUtils.getUpdateField(model));
  95 + Assert.notNull(update, "execute update method must not null.");
  96 + mongoTemplate.updateMulti(new MongoQuery(new MongoCondition("id", model.getId(), MongoOper.IS)).convertToMongoQuery(), update, SieveResultModel.class);
  97 + }
  98 +
89 99 /**
90 100 * 查询产筛列表
91 101 *
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java View file @ 10ff1ff
... ... @@ -49,6 +49,10 @@
49 49 return iSieveDao.queryListSieveResult(sieveResultQuery.convertToQuery());
50 50 }
51 51  
  52 + public void updateSieveRsult(SieveResultModel model) {
  53 + iSieveDao.updateSieveResult(model);
  54 + }
  55 +
52 56 public void updateOneChanQianDiaSieve(SieveModel sieveModel) {
53 57 sieveModel.setModified(new Date());
54 58 iSieveDao.updateChanQianSieve(sieveModel);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java View file @ 10ff1ff
... ... @@ -75,8 +75,6 @@
75 75  
76 76 @Autowired
77 77 private SyncDataTaskService syncDataTaskService;
78   - @Autowired
79   - private SieveService sieveService;
80 78  
81 79 @Autowired
82 80 private OrganizationService organizationService;
... ... @@ -133,6 +131,9 @@
133 131 private PatientMedicalRecordFacade patientMedicalRecordFacade;
134 132  
135 133 @Autowired
  134 + private SieveService sieveService;
  135 +
  136 + @Autowired
136 137 private CdfyHisService cdfyHisService;
137 138  
138 139  
139 140  
... ... @@ -1686,6 +1687,78 @@
1686 1687 return cdfyHisService.getIdByVcCardNo(code);
1687 1688 }
1688 1689  
  1690 + @RequestMapping(value = "/handleSieveTime", method = RequestMethod.GET)
  1691 + @ResponseBody
  1692 + public String doSieveTime(@RequestParam(required = false) String hospitalId,
  1693 + @RequestParam(required = false) String patientId) {
1689 1694  
  1695 + SieveQuery sieveQuery = new SieveQuery();
  1696 + sieveQuery.setYn(YnEnums.YES.getId());
  1697 + sieveQuery.setHospitalId(hospitalId);
  1698 + sieveQuery.setParentId(patientId);
  1699 +
  1700 + SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery();
  1701 + sieveApplyOrderQuery1.setYn(YnEnums.YES.getId());
  1702 +
  1703 + SieveResultQuery sieveResultQuery = new SieveResultQuery();
  1704 + sieveResultQuery.setYn(YnEnums.YES.getId());
  1705 +
  1706 + List<SieveModel> list = sieveService.queryList(sieveQuery);
  1707 + if (CollectionUtils.isNotEmpty(list)) {
  1708 + int batchSize = 2000;
  1709 + int end = 0;
  1710 + for (int i = 0; i < list.size(); i += batchSize) {
  1711 + end = (end + batchSize);
  1712 + if (end > list.size()) {
  1713 + end = list.size();
  1714 + }
  1715 + System.out.println("start:" + i + ",end:" + end);
  1716 + final List<SieveModel> sieveModels = list.subList(i, end);
  1717 + for (SieveModel model : sieveModels)
  1718 + {
  1719 +
  1720 + System.out.println(model.getParentId());
  1721 + sieveApplyOrderQuery1.setParentId(model.getParentId());
  1722 + sieveApplyOrderQuery1.setHospitalId(hospitalId);
  1723 +
  1724 + List<SieveApplyOrderModel> list1 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1);
  1725 +
  1726 + if (CollectionUtils.isNotEmpty(list1))
  1727 + {
  1728 + SieveApplyOrderModel applyOrderModel = list1.get(0);
  1729 + if (applyOrderModel.getApplyTime() == null)
  1730 + {
  1731 + applyOrderModel.setApplyTime(applyOrderModel.getCreated());
  1732 + applyOrderService.updateSieve(applyOrderModel);
  1733 + model.setApplyTime(applyOrderModel.getCreated());
  1734 + sieveService.updateOneChanQianDiaSieve(model);
  1735 + }
  1736 + }
  1737 +
  1738 + sieveResultQuery.setParentId(model.getParentId());
  1739 +
  1740 + List<SieveResultModel> sieveResultModels = sieveService.queryListSieveResult(sieveResultQuery);
  1741 + if (CollectionUtils.isNotEmpty(sieveResultModels))
  1742 + {
  1743 + SieveResultModel sieveResultModel = sieveResultModels.get(0);
  1744 + if (sieveResultModel.getDiagnosisTime() == null)
  1745 + {
  1746 + sieveResultModel.setDiagnosisTime(sieveResultModel.getCreated());
  1747 + sieveService.updateSieveRsult(sieveResultModel);
  1748 + model.setDiagnosisTime(sieveResultModel.getCreated());
  1749 + sieveService.updateOneChanQianDiaSieve(model);
  1750 + }
  1751 + }
  1752 +
  1753 + if (model.getResultTime() == null)
  1754 + {
  1755 + model.setResultTime(model.getModified());
  1756 + sieveService.updateOneChanQianDiaSieve(model);
  1757 + }
  1758 + }
  1759 + }
  1760 + }
  1761 + return "handleSieveTime .....";
  1762 + }
1690 1763 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java View file @ 10ff1ff
... ... @@ -1552,6 +1552,7 @@
1552 1552 babyEarBaseView.setServiceType(ServiceTypeEnums.getTitleById(babyEarBase.getServiceType()));
1553 1553 babyEarBaseView.setServiceStatus(ServiceStatusEnums.getNameById(babyEarBase.getServiceStatus()));
1554 1554 babyEarBaseView.setMonthAge(babyEarBase.getMonthAge());
  1555 + babyEarBaseView.setFileCode(babyEarBase.getFileCode());
1555 1556 return babyEarBaseView;
1556 1557 }
1557 1558  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java View file @ 10ff1ff
... ... @@ -183,6 +183,7 @@
183 183 setFproTypeId(babyModel.getFproTypeId());
184 184 setHighRiskCause(babyModel.getHighRiskReason());
185 185 setCreateUserId(babyModel.getBuildDoctor());
  186 + setFileCode(babyModel.getFileCode());
186 187 }
187 188  
188 189 @Override
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyEarBaseView.java View file @ 10ff1ff
... ... @@ -102,6 +102,18 @@
102 102 //备注
103 103 private String remark;
104 104  
  105 +
  106 + //档案编号 滦平需求
  107 + private String fileCode;
  108 +
  109 + public String getFileCode() {
  110 + return fileCode;
  111 + }
  112 +
  113 + public void setFileCode(String fileCode) {
  114 + this.fileCode = fileCode;
  115 + }
  116 +
105 117 public List<PatientSerResult> getPatientSerResults() {
106 118 return patientSerResults;
107 119 }