shiyang / regional-platform

Download as
Browse Code »

Commit eda354356a08e672eb7ca1ab681d4dff504494b0

Authored by liquanyu
2 parents b39fc165d1 a7beea859d
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 5 changed files

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntenatalExaminationService.java View file @ eda3543
... ... @@ -126,7 +126,7 @@
126 126 }
127 127  
128 128 public List<AntExChuModel> queryAntExChu(AntExChuQuery antExChuQuery){
129   - return iAntExChuDao.query(antExChuQuery.convertToQuery());
  129 + return iAntExChuDao.query(antExChuQuery.convertToQuery().addOrder(Sort.Direction.DESC,"created"));
130 130 }
131 131  
132 132 public List<AntenatalExaminationModel> queryYuyueAntenatalExamination(Date yuYueDate,String hospitalId) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ eda3543
... ... @@ -416,7 +416,7 @@
416 416 data = queryRiskName(l);
417 417 }
418 418  
419   - antexListResult.convertToResult(list, patients, antExChuModel);
  419 + antexListResult.convertToResult(list, patients, antExChulist);
420 420 antexListResult.setIsSieve(cap(patients.getLastMenses(),patients.getId()));
421 421 antexListResult.setRiskFactor(data);
422 422 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(antexListResult);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ eda3543
... ... @@ -134,6 +134,19 @@
134 134 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
135 135 }
136 136  
  137 + private BabyModel fillBaby(Patients patients){
  138 + BabyModel babyModel=new BabyModel();
  139 + babyModel.setAreaId(patients.getAreaId());
  140 + babyModel.setProvinceId(patients.getProvinceId());
  141 + babyModel.setCityId(patients.getCityId());
  142 + babyModel.setMname(patients.getUsername());
  143 + babyModel.setMjob(patients.getPworkUnit());
  144 + babyModel.setMphone(patients.getPhone());
  145 + babyModel.setMbirth(patients.getBirth());
  146 + babyModel.setFjob(patients.getHworkUnit());
  147 + babyModel.setFphone(patients.getHusbandPhone());
  148 + return babyModel;
  149 + }
137 150 /**
138 151 * 处理儿童
139 152 *
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java View file @ eda3543
... ... @@ -197,7 +197,7 @@
197 197 data = queryRiskName(l);
198 198 }
199 199  
200   - antexListResult.convertToResult(list, patients, antExChuModel);
  200 + antexListResult.convertToResult(list, patients, antExChulist);
201 201  
202 202 antexListResult.setRiskFactor(data);
203 203 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java View file @ eda3543
... ... @@ -145,7 +145,7 @@
145 145 this.yChanQi = yChanQi;
146 146 }
147 147  
148   - public AntexListResult convertToResult(List<AntenatalExaminationModel> destModel,Patients patients,AntExChuModel antExChuModel) {
  148 + public AntexListResult convertToResult(List<AntenatalExaminationModel> destModel,Patients patients,List<AntExChuModel> antExChuModel) {
149 149 setId(patients.getId());
150 150 try {
151 151 if(null!=patients.getBirth()){
... ... @@ -171,8 +171,10 @@
171 171 setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses()));
172 172 }
173 173 List<AntData> dataList = new ArrayList<>();
174   - if(null!=antExChuModel){
175   - dataList.add(new AntData(antExChuModel,""));
  174 + if(CollectionUtils.isNotEmpty(antExChuModel)){
  175 + for(AntExChuModel antExChuModel1:antExChuModel){
  176 + dataList.add(new AntData(antExChuModel1,""));
  177 + }
176 178 }
177 179 if(CollectionUtils.isNotEmpty(destModel)){
178 180 for(AntenatalExaminationModel model:destModel){