liquanyu / regional-platform

Download as
Browse Code »

Commit e354382c267b9f18bac53eedca307c097f70ab4c

Authored by yangfei
1 parent 95a78f007f
Exists in master and in 1 other branch dev

追访概况中，分娩方式未取到

Showing 1 changed file with 40 additions and 9 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java View file @ e354382
... ... @@ -51,6 +51,9 @@
51 51 @Autowired
52 52 private PostReviewService postReviewService;
53 53  
  54 + @Autowired
  55 + private MatDeliverService matDeliverService;
  56 +
54 57 /**
55 58 * @param buildStart
56 59 * @param buildEnd
... ... @@ -146,7 +149,21 @@
146 149 temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉
147 150 } else if (patients.getType() == 3) {
148 151 temp.put("fm", 1); // 分娩 1=勾勾 2=叉叉
149   - temp.put("fmType", patients.getFmType()); // 分娩方式 1： 顺产，2：剖宫产
  152 + if (patients.getIsAutoFm() != null && patients.getIsAutoFm() == 1) {
  153 + /** 生产方式 */
  154 + temp.put("fmType", "自动分娩");
  155 + } else {
  156 + MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
  157 + matDeliverQuery.setParentId(patients.getId());
  158 + matDeliverQuery.setYn(YnEnums.YES.getId());
  159 + //查询分娩记录
  160 + List<MaternalDeliverModel> list2 = matDeliverService.query(matDeliverQuery);
  161 + if (org.apache.commons.collections.CollectionUtils.isNotEmpty(list2)) {
  162 + MaternalDeliverModel maternalDeliverModel = list2.get(0);
  163 + /** 生产方式 */
  164 + temp.put("fmType", FmTypeEnums.getFmNameById2(maternalDeliverModel.getFmType()));
  165 + }
  166 + }
150 167 }
151 168  
152 169 //孕检次数
... ... @@ -179,9 +196,9 @@
179 196 } else {
180 197 if (patients.getType() == 3) {//已经分娩，就是X
181 198 temp.put("cqsc", 2);//产前筛查){
182   - }else{//未分娩，
183   - int week = DateUtil.getWeek2(patients.getLastMenses(),new Date());
184   - if(week>20){//不能做产前筛查追访，产前检查追访
  199 + } else {//未分娩，
  200 + int week = DateUtil.getWeek2(patients.getLastMenses(), new Date());
  201 + if (week > 20) {//不能做产前筛查追访，产前检查追访
185 202 temp.put("cqsc", 2);//未做产筛
186 203 }
187 204 }
... ... @@ -265,8 +282,22 @@
265 282 if (patient.getDueStatus() == 1 || (patient.getIsAutoFm() != null && patient.getIsAutoFm() == 1)) {//终止妊娠,或自动分娩
266 283 temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉
267 284 } else if (patient.getType() == 3) { //本院已分娩
268   - temp.put("fm", 1); // 孕期建档 1=勾勾 2=叉叉
269   - temp.put("fmType", patient.getFmType()); // 分娩方式 1： 顺产，2：剖宫产
  285 + temp.put("fm", 1); // 分娩 1=勾勾 2=叉叉
  286 + if (patient.getIsAutoFm() != null && patient.getIsAutoFm() == 1) {
  287 + /** 生产方式 */
  288 + temp.put("fmType", "自动分娩");
  289 + } else {
  290 + MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
  291 + matDeliverQuery.setParentId(patient.getId());
  292 + matDeliverQuery.setYn(YnEnums.YES.getId());
  293 + //查询分娩记录
  294 + List<MaternalDeliverModel> list2 = matDeliverService.query(matDeliverQuery);
  295 + if (org.apache.commons.collections.CollectionUtils.isNotEmpty(list2)) {
  296 + MaternalDeliverModel maternalDeliverModel = list2.get(0);
  297 + /** 生产方式 */
  298 + temp.put("fmType", FmTypeEnums.getFmNameById2(maternalDeliverModel.getFmType()));
  299 + }
  300 + }
270 301 }
271 302  
272 303 //孕检次数
... ... @@ -300,9 +331,9 @@
300 331 } else {
301 332 if (patient.getType() == 3) {//已经分娩，就是X
302 333 temp.put("cqsc", 2);//产前筛查){
303   - }else{//未分娩，
304   - int week = DateUtil.getWeek2(patient.getLastMenses(),new Date());
305   - if(week>20){//不能做产前筛查追访，产前检查追访
  334 + } else {//未分娩，
  335 + int week = DateUtil.getWeek2(patient.getLastMenses(), new Date());
  336 + if (week > 20) {//不能做产前筛查追访，产前检查追访
306 337 temp.put("cqsc", 2);//未做产筛
307 338 }
308 339 }