fangcheng / regional-platform

Download as
Browse Code »

Commit 13c300c65ccd3d807dad209bab515dfc271567cf

Authored by jiangjiazhi
1 parent 229618bcac
Exists in master and in 1 other branch nobuildprocess

修改产检删除

Showing 2 changed files with 12 additions and 8 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java View file @ 13c300c
... ... @@ -95,17 +95,17 @@
95 95  
96 96  
97 97  
98   - private void syncSingle(String parentId){
  98 + private void syncSingle(String pid){
99 99 AntExQuery antExQuery = new AntExQuery();
100 100 antExQuery.setYn(YnEnums.YES.getId());
101   - antExQuery.setParentId(parentId);
  101 + antExQuery.setPid(pid);
102 102 //复诊
103 103 List<AntenatalExaminationModel> list = antExService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC,"checkDate"));
104 104 for (AntenatalExaminationModel antEx : list) {
105 105 AntExRecordModel record = convert(antEx);
106 106 if (null != record) {
107 107 AntExRecordQuery antExRecordQuery = new AntExRecordQuery();
108   - antExRecordQuery.setParentId(record.getParentId());
  108 + antExRecordQuery.setPid(record.getPid());
109 109 antExRecordQuery.setcId(record.getCheckDoctor());
110 110 Integer count = count(antExRecordQuery);
111 111 if (null == count || 0 == count) {
... ... @@ -118,7 +118,7 @@
118 118 //初诊
119 119 AntExChuQuery antExChuQuery = new AntExChuQuery();
120 120 antExChuQuery.setYn(YnEnums.YES.getId());
121   - antExChuQuery.setParentId(parentId);
  121 + antExChuQuery.setPid(pid);
122 122 List<AntExChuModel> antExChuModelList = antExService.queryAntExChu(antExChuQuery.convertToQuery());
123 123  
124 124 if (CollectionUtils.isNotEmpty(antExChuModelList)) {
... ... @@ -126,7 +126,7 @@
126 126 AntExRecordModel record = convert(antEx);
127 127 if (null != record) {
128 128 AntExRecordQuery antExRecordQuery = new AntExRecordQuery();
129   - antExRecordQuery.setParentId(record.getParentId());
  129 + antExRecordQuery.setPid(record.getPid());
130 130 antExRecordQuery.setcId(record.getCheckDoctor());
131 131 Integer count = count(antExRecordQuery);
132 132 if (null == count || 0 == count) {
... ... @@ -147,7 +147,7 @@
147 147 return;
148 148 }
149 149 AntExRecordQuery antExRecordQuery1 = new AntExRecordQuery();
150   - antExRecordQuery1.setParentId(parentId);
  150 + antExRecordQuery1.setPid(parentId);
151 151 antExRecordDao.findAndMove(antExRecordQuery1.convertToQuery());
152 152  
153 153  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 13c300c
... ... @@ -272,7 +272,9 @@
272 272  
273 273 //初诊,修改产检管理
274 274 // antenatalExaminationService.updateAntExRecord(antExChuModel.getId(), 1);
275   - recordService.handExRecord(antExChuModel.getParentId());
  275 + if(StringUtils.isNotEmpty(antExChuModel.getPid())) {
  276 + recordService.handExRecord(antExChuModel.getPid());
  277 + }
276 278 } else {
277 279 AntExChuQuery antExChuQuery1 = new AntExChuQuery();
278 280 antExChuQuery1.setParentId(excAddRequest.getParentId());
... ... @@ -313,7 +315,9 @@
313 315 //修改本院最后一次定义高危
314 316 updateLastRhTime(patients.getId(), hospitalId);
315 317 setLashCTimes(hospitalId, antExChuModel.getParentId(), 1);
316   - recordService.handExRecord(antExChuModel.getParentId());
  318 + if(StringUtils.isNotEmpty(antExChuModel.getPid())){
  319 + recordService.handExRecord(antExChuModel.getPid());
  320 + }
317 321 if (null != patients.getBuildType() && patients.getBuildType() == 3) {
318 322 Patients patients1 = new Patients();
319 323 patients1.setEnable("1");