From f79057107dd5c5660e7fc06d2ecac031c0cb10a1 Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Fri, 28 Sep 2018 11:52:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=89=8D=E8=AF=8A=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/pojo/DiagnosisModel.java | 9 +++ .../com/lyms/platform/query/DiagnosisQuery.java | 65 +++++++++------- .../web/controller/DiagnosisController.java | 22 ++++++ .../operate/web/facade/BabySieveFacede.java | 87 ++++++++++++++++++++-- .../operate/web/facade/DiagnosisFacaed.java | 38 ++++++---- .../operate/web/request/DiagnosisAddRequest.java | 35 ++++----- .../operate/web/result/BabySieveManager.java | 11 +++ .../operate/web/result/BabySieveResult.java | 3 +- .../operate/web/utils/BabySieveHandleTask.java | 46 +++++++++++- 9 files changed, 245 insertions(+), 71 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/DiagnosisModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/DiagnosisModel.java index f28de01..9615069 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/DiagnosisModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/DiagnosisModel.java @@ -22,6 +22,7 @@ public class DiagnosisModel extends BaseModel { private String cardNo;//身份证号 private String age;//年龄 private String dueWeek;//孕周 + private Integer dueDays;//孕周天数 private String applyWeek;//申请孕周 private String nowWeek;//当前孕周 private String rsResult;//妊娠结局 @@ -340,6 +341,14 @@ public class DiagnosisModel extends BaseModel { this.ztfeText = ztfeText; } + public Integer getDueDays() { + return dueDays; + } + + public void setDueDays(Integer dueDays) { + this.dueDays = dueDays; + } + public Map contomap(){ Map map = new HashMap(); map.put("id",id); diff --git a/platform-dal/src/main/java/com/lyms/platform/query/DiagnosisQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/DiagnosisQuery.java index 08f7a93..c8541a3 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/DiagnosisQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/DiagnosisQuery.java @@ -8,6 +8,9 @@ import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.common.utils.StringUtils; import org.springframework.data.mongodb.core.query.Criteria; +import java.util.Date; +import java.util.List; + /** * 新增产前诊断申请 * Created by Administrator on 2018/9/10. @@ -18,19 +21,20 @@ public class DiagnosisQuery extends BaseQuery implements IConvertToNativeQuery { private String parentId;//孕妇建档ID private String queryNos;//查询号 private String diaStatus;//数据状态 + private List diaStatus2;//数据状态 private String queryNo;//查询号 private String order;//排序字段 private String hospitalId;//医院ID private String cardNo;//身份证 private String vcCardNo;//就诊卡号 private String diaResult;//诊断结果 - private String applyWeeksStart;//申请开始孕周 - private String applyWeeksEnd;//申请结束孕周 - private String nowWeeksStart;//当前开始孕周 - private String nowWeeksEnd;//当前结束孕周 + private Integer applyWeeksStart;//申请开始孕周 + private Integer applyWeeksEnd;//申请结束孕周 + private Date lastMensesStart;//当前开始孕周 + private Date lastMensesEnd;//当前结束孕周 private String rsResult;//妊娠结局 - private String applyDateStart;//申请开始时间 - private String applyDateEnd;//申请结束时间 + private Date applyDateStart;//申请开始时间 + private Date applyDateEnd;//申请结束时间 private String resultDateStart;//诊断出具开始时间 private String resultDateEnd;//诊断出具结束时间 private String specimenNo;//标本号 @@ -69,6 +73,14 @@ public class DiagnosisQuery extends BaseQuery implements IConvertToNativeQuery { this.diaStatus = diaStatus; } + public List getDiaStatus2() { + return diaStatus2; + } + + public void setDiaStatus2(List diaStatus2) { + this.diaStatus2 = diaStatus2; + } + public String getQueryNo() { return queryNo; } @@ -117,36 +129,36 @@ public class DiagnosisQuery extends BaseQuery implements IConvertToNativeQuery { this.diaResult = diaResult; } - public String getApplyWeeksStart() { + public Integer getApplyWeeksStart() { return applyWeeksStart; } - public void setApplyWeeksStart(String applyWeeksStart) { + public void setApplyWeeksStart(Integer applyWeeksStart) { this.applyWeeksStart = applyWeeksStart; } - public String getApplyWeeksEnd() { + public Integer getApplyWeeksEnd() { return applyWeeksEnd; } - public void setApplyWeeksEnd(String applyWeeksEnd) { + public void setApplyWeeksEnd(Integer applyWeeksEnd) { this.applyWeeksEnd = applyWeeksEnd; } - public String getNowWeeksStart() { - return nowWeeksStart; + public Date getLastMensesStart() { + return lastMensesStart; } - public void setNowWeeksStart(String nowWeeksStart) { - this.nowWeeksStart = nowWeeksStart; + public void setLastMensesStart(Date lastMensesStart) { + this.lastMensesStart = lastMensesStart; } - public String getNowWeeksEnd() { - return nowWeeksEnd; + public Date getLastMensesEnd() { + return lastMensesEnd; } - public void setNowWeeksEnd(String nowWeeksEnd) { - this.nowWeeksEnd = nowWeeksEnd; + public void setLastMensesEnd(Date lastMensesEnd) { + this.lastMensesEnd = lastMensesEnd; } public String getRsResult() { @@ -157,19 +169,19 @@ public class DiagnosisQuery extends BaseQuery implements IConvertToNativeQuery { this.rsResult = rsResult; } - public String getApplyDateStart() { + public Date getApplyDateStart() { return applyDateStart; } - public void setApplyDateStart(String applyDateStart) { + public void setApplyDateStart(Date applyDateStart) { this.applyDateStart = applyDateStart; } - public String getApplyDateEnd() { + public Date getApplyDateEnd() { return applyDateEnd; } - public void setApplyDateEnd(String applyDateEnd) { + public void setApplyDateEnd(Date applyDateEnd) { this.applyDateEnd = applyDateEnd; } @@ -225,6 +237,9 @@ public class DiagnosisQuery extends BaseQuery implements IConvertToNativeQuery { if(null != collectHospitalId){ condition = condition.and("collectHospitalId", collectHospitalId, MongoOper.IS); } + if(null != diaStatus2){ + condition = condition.and("diaStatus", diaStatus2, MongoOper.IN); + } Criteria c = null; if(null != applyDateStart && null != applyDateEnd){ @@ -237,11 +252,11 @@ public class DiagnosisQuery extends BaseQuery implements IConvertToNativeQuery { c = Criteria.where("applyWeek").gte(applyWeeksStart).lte(applyWeeksEnd); } } - if(null != nowWeeksStart && null != nowWeeksEnd){ + if(null != lastMensesStart && null != lastMensesEnd){ if(c != null){ - c = c.where("lastMenses").gte(nowWeeksStart).lte(nowWeeksEnd); + c = c.where("lastMenses").gte(lastMensesStart).lte(lastMensesEnd); }else{ - c = Criteria.where("lastMenses").gte(nowWeeksStart).lte(nowWeeksEnd); + c = Criteria.where("lastMenses").gte(lastMensesStart).lte(lastMensesEnd); } } if (StringUtils.isNotEmpty(queryNo)) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DiagnosisController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DiagnosisController.java index 5d7c432..74de061 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DiagnosisController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DiagnosisController.java @@ -48,6 +48,28 @@ public class DiagnosisController { @RequestMapping(value = "/addDiagnosis",method = RequestMethod.GET) public BaseResponse addOrUpdateDiagnosis(DiagnosisAddRequest diagnosisAddRequest,HttpServletRequest request){ //LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + diagnosisAddRequest.setName("李欣"); + diagnosisAddRequest.setId("5bad9c8193131f38be325f04"); + diagnosisAddRequest.setCardNo("210224199007216341"); + diagnosisAddRequest.setPhone("15533641942"); + diagnosisAddRequest.setAge("28"); + diagnosisAddRequest.setDueWeek("孕14周+2天"); + diagnosisAddRequest.setyChanQi("2019-03-08"); + diagnosisAddRequest.setDiaProject("1");//羊水穿刺 + diagnosisAddRequest.setBirth("1990-07-21"); + diagnosisAddRequest.setWeight("60"); + diagnosisAddRequest.setLastMenses("2018-06-01"); + diagnosisAddRequest.setMensStartDay("28"); + diagnosisAddRequest.setMensEndDay("30"); + diagnosisAddRequest.setMensStopStartDay("5"); + diagnosisAddRequest.setMensStopEndDay("7"); + diagnosisAddRequest.setSpecimenNo("00001"); + diagnosisAddRequest.setCollectDocterId("1000000185"); + diagnosisAddRequest.setCollectDate("2018-09-28"); + diagnosisAddRequest.setSendDocterId("1000000185"); + diagnosisAddRequest.setSendDate("2018-09-29"); + diagnosisAddRequest.setCollectHospitalId("216"); + diagnosisAddRequest.setHospitalId("216"); return diagnosisFacaed.addOrUpdateDiagnosis(diagnosisAddRequest, 1000000185); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java index 2d23a44..b586909 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabySieveFacede.java @@ -125,7 +125,8 @@ public class BabySieveFacede { String jzShi = CommonsHelper.getName1(pat.getCityRegisterId(), basicConfigService); String jzXian = CommonsHelper.getName1(pat.getAreaRegisterId(), basicConfigService); String jzXiang = CommonsHelper.getName1(pat.getStreetRegisterId(), basicConfigService); - String jQquan = jzSheng+jzShi+jzXian+jzXiang; + String jzd = pat.getAddressRegister(); + String jQquan = jzSheng+jzShi+jzXian+jzXiang+jzd; babySieveResult.convert(pat); babySieveResult.setAdress(jQquan); List list = new ArrayList(); @@ -600,6 +601,44 @@ public class BabySieveFacede { if (patients.getBirth() != null) { babySieveManager.setAge(DateUtil.getAge(patients.getBirth())); } + + //分娩方式 + String deliveryMode = ""; + if (StringUtils.isNotEmpty(maternalDeliverModelList.get(0).getDeliveryMode())) { + + StringBuilder sb = new StringBuilder(); + + Map m = JsonUtil.str2Obj(maternalDeliverModelList.get(0).getDeliveryMode(), Map.class); + String fmfs = null; + if (m != null) { + Object b = m.get("fmfs"); + if (b != null) { + fmfs = b.toString(); + if (fmfs != null) { + if (fmfs.equals("1")) { + String fmName = FmTypeEnums.getFmNameById(fmfs); + sb.append(fmName); + if (null != m.get("scfs") && !"null".equals(m.get("scfs").toString())) { + sb.append(","); + String scfs = m.get("scfs").toString(); + sb.append(FmTypeEnums.getFmScNameById(scfs)); + } + deliveryMode = sb.toString(); + } else if (fmfs.equals("2")) { + String fmName = FmTypeEnums.getFmNameById(fmfs); + deliveryMode = fmName; + } + } + } + } + } + if (deliveryMode.contains("顺产")) { + babySieveManager.setDueType(deliveryMode); + } else { + babySieveManager.setDueType(deliveryMode); + babySieveManager.setOperationCause(maternalDeliverModelList.get(0).getOperationCause() == null ? "--" : maternalDeliverModelList.get(0).getOperationCause()); + } + List babies = maternalDeliverModelList.get(0).getBaby(); if (babies != null && babies.size() > 0) { for (MaternalDeliverModel.Baby baby : babies) { @@ -644,13 +683,13 @@ public class BabySieveFacede { if (new Integer(1).equals(highRisk)) { babySieveManager.setHighRisk("高危"); } - String dueType = babySieveManager.getDueType(); + /*String dueType = babySieveManager.getDueType(); if ("1".equals(dueType)) { babySieveManager.setDueType("顺产"); } if ("2".equals(dueType)) { babySieveManager.setDueType("剖宫产"); - } + }*/ babySieveManager.setSieveStatus(StringUtils.isEmpty(model.getSieveStatus()) ? "0" : model.getSieveStatus()); babySieveManager.setmName(model.getMname()); @@ -737,6 +776,44 @@ public class BabySieveFacede { if (patients.getBirth() != null) { babySieveManager.setAge(DateUtil.getAge(patients.getBirth())); } + + //分娩方式 + String deliveryMode = ""; + if (StringUtils.isNotEmpty(maternalDeliverModelList.get(0).getDeliveryMode())) { + + StringBuilder sb = new StringBuilder(); + + Map m = JsonUtil.str2Obj(maternalDeliverModelList.get(0).getDeliveryMode(), Map.class); + String fmfs = null; + if (m != null) { + Object b = m.get("fmfs"); + if (b != null) { + fmfs = b.toString(); + if (fmfs != null) { + if (fmfs.equals("1")) { + String fmName = FmTypeEnums.getFmNameById(fmfs); + sb.append(fmName); + if (null != m.get("scfs") && !"null".equals(m.get("scfs").toString())) { + sb.append(","); + String scfs = m.get("scfs").toString(); + sb.append(FmTypeEnums.getFmScNameById(scfs)); + } + deliveryMode = sb.toString(); + } else if (fmfs.equals("2")) { + String fmName = FmTypeEnums.getFmNameById(fmfs); + deliveryMode = fmName; + } + } + } + } + } + if (deliveryMode.contains("顺产")) { + babySieveManager.setDueType(deliveryMode); + } else { + babySieveManager.setDueType(deliveryMode); + babySieveManager.setOperationCause(maternalDeliverModelList.get(0).getOperationCause() == null ? "--" : maternalDeliverModelList.get(0).getOperationCause()); + } + List babies = maternalDeliverModelList.get(0).getBaby(); if (babies != null && babies.size() > 0) { for (MaternalDeliverModel.Baby baby : babies) { @@ -781,13 +858,13 @@ public class BabySieveFacede { if (new Integer(1).equals(highRisk)) { babySieveManager.setHighRisk("高危"); } - String dueType = babySieveManager.getDueType(); + /*String dueType = babySieveManager.getDueType(); if ("1".equals(dueType)) { babySieveManager.setDueType("顺产"); } if ("2".equals(dueType)) { babySieveManager.setDueType("剖宫产"); - } + }*/ babySieveManager.setSieveStatus(StringUtils.isEmpty(model.getSieveStatus()) ? "0" : model.getSieveStatus()); babySieveManager.setmName(model.getMname()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java index 1d47c3d..308def9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java @@ -234,16 +234,16 @@ public class DiagnosisFacaed { diagnosisQuery.setDiaResult(dataresult.getDiaResult()); } if(null != dataresult.getApplyWeekStart()){ - diagnosisQuery.setApplyWeeksStart(dataresult.getApplyWeekStart()); + diagnosisQuery.setApplyWeeksStart(7 * Integer.valueOf(dataresult.getApplyWeekStart())); } if(null != dataresult.getApplyWeekEnd()){ - diagnosisQuery.setApplyWeeksEnd(dataresult.getApplyWeekEnd()); + diagnosisQuery.setApplyWeeksEnd(7 * Integer.valueOf(dataresult.getApplyWeekEnd()) + 6); } if(null != dataresult.getNowWeeksStart()){ - diagnosisQuery.setNowWeeksStart(dataresult.getNowWeeksStart()); + diagnosisQuery.setLastMensesEnd(DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(dataresult.getNowWeeksStart() * 7))); } if(null != dataresult.getNowWeeksEnd()){ - diagnosisQuery.setNowWeeksEnd(dataresult.getNowWeeksEnd()); + diagnosisQuery.setLastMensesStart(DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(dataresult.getNowWeeksEnd() * 7) - 6)); } if(null != dataresult.getDiaStatus()){ diagnosisQuery.setDiaStatus(dataresult.getDiaStatus()); @@ -254,11 +254,13 @@ public class DiagnosisFacaed { if(null != dataresult.getQueryNo()){ diagnosisQuery.setQueryNo(dataresult.getQueryNo()); } - if(null != dataresult.getApplyDateStart()){ - diagnosisQuery.setApplyDateStart(dataresult.getApplyDateStart()); - } - if(null != dataresult.getApplyDateEnd()){ - diagnosisQuery.setApplyDateEnd(dataresult.getApplyDateEnd()); + if(StringUtils.isNotEmpty(dataresult.getApplyDate())){ + String[] dates = dataresult.getApplyDate().split(" - "); + diagnosisQuery.setApplyDateStart(DateUtil.parseYMD(dates[0])); + + if (dates.length == 2) { + diagnosisQuery.setApplyDateEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59")); + } } if(null != dataresult.getResultDateStart()){ diagnosisQuery.setResultDateStart(dataresult.getResultDateStart()); @@ -320,11 +322,13 @@ public class DiagnosisFacaed { public DiagnosisManagerResult queryDiagnosisLab(DiagnosisAddRequest dataresult){ DiagnosisManagerResult diagnosisManagerResult = new DiagnosisManagerResult(); DiagnosisQuery diagnosisQuery = new DiagnosisQuery(); - if(null != dataresult.getApplyDateStart()){ - diagnosisQuery.setApplyDateStart(dataresult.getApplyDateStart()); - } - if(null != dataresult.getApplyDateEnd()){ - diagnosisQuery.setApplyDateEnd(dataresult.getApplyDateEnd()); + if(StringUtils.isNotEmpty(dataresult.getApplyDate())){ + String[] dates = dataresult.getApplyDate().split(" - "); + diagnosisQuery.setApplyDateStart(DateUtil.parseYMD(dates[0])); + + if (dates.length == 2) { + diagnosisQuery.setApplyDateEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59")); + } } if(null != dataresult.getCollectHospitalId()){ diagnosisQuery.setCollectHospitalId(dataresult.getCollectHospitalId()); @@ -345,7 +349,11 @@ public class DiagnosisFacaed { diagnosisQuery.setQueryNo(dataresult.getQueryNo()); } //只查询状态为已申请和已接收的 - + List listString = new ArrayList(); + listString.add("1"); + listString.add("2"); + listString.add("3"); + diagnosisQuery.setDiaStatus2(listString); diagnosisQuery.setPage(dataresult.getPage()); diagnosisQuery.setLimit(dataresult.getLimit()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DiagnosisAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DiagnosisAddRequest.java index 93ed687..b31f828 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DiagnosisAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DiagnosisAddRequest.java @@ -75,13 +75,11 @@ public class DiagnosisAddRequest implements IBasicRequestConvert //申请孕周结束 private String applyWeekEnd; //当前孕周开始 - private String nowWeeksStart; + private Integer nowWeeksStart; //当前孕周结束 - private String nowWeeksEnd; - //产前诊断申请开始时间 - private String applyDateStart; - //产前诊断申请结束时间 - private String applyDateEnd; + private Integer nowWeeksEnd; + //产前诊断申请时间 + private String applyDate; //诊断出具开始时间 private String resultDateStart; //诊断出具结束时间 @@ -341,36 +339,28 @@ public class DiagnosisAddRequest implements IBasicRequestConvert this.applyWeekEnd = applyWeekEnd; } - public String getNowWeeksStart() { + public Integer getNowWeeksStart() { return nowWeeksStart; } - public void setNowWeeksStart(String nowWeeksStart) { + public void setNowWeeksStart(Integer nowWeeksStart) { this.nowWeeksStart = nowWeeksStart; } - public String getNowWeeksEnd() { + public Integer getNowWeeksEnd() { return nowWeeksEnd; } - public void setNowWeeksEnd(String nowWeeksEnd) { + public void setNowWeeksEnd(Integer nowWeeksEnd) { this.nowWeeksEnd = nowWeeksEnd; } - public String getApplyDateStart() { - return applyDateStart; + public String getApplyDate() { + return applyDate; } - public void setApplyDateStart(String applyDateStart) { - this.applyDateStart = applyDateStart; - } - - public String getApplyDateEnd() { - return applyDateEnd; - } - - public void setApplyDateEnd(String applyDateEnd) { - this.applyDateEnd = applyDateEnd; + public void setApplyDate(String applyDate) { + this.applyDate = applyDate; } public String getResultDateStart() { @@ -415,6 +405,7 @@ public class DiagnosisAddRequest implements IBasicRequestConvert diagnosisModel.setCardNo(cardNo); diagnosisModel.setAge(age); diagnosisModel.setDueWeek(dueWeek); + diagnosisModel.setDueDays(100); diagnosisModel.setyChanQi(DateUtil.parseYMD(yChanQi)); diagnosisModel.setPhone(phone); diagnosisModel.setDiaProject(diaProject); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabySieveManager.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabySieveManager.java index 434ebdd..af2fc4a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabySieveManager.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabySieveManager.java @@ -76,6 +76,17 @@ public class BabySieveManager { //试验号 private String testNumber; + //手术原因 + private String operationCause; + + public String getOperationCause() { + return operationCause; + } + + public void setOperationCause(String operationCause) { + this.operationCause = operationCause; + } + public String getTestNumber() { return testNumber; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabySieveResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabySieveResult.java index d59df34..65b3f06 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabySieveResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabySieveResult.java @@ -229,6 +229,7 @@ public class BabySieveResult { } public BabySieveResult convert(Patients pat){ + setNowWeeks("已分娩"); setId(pat.getId()); try { if (null != pat.getBirth()) { @@ -248,7 +249,7 @@ public class BabySieveResult { /*int days = DateUtil.daysBetween(pat.getLastMenses(), new Date()); this.dueWeek = StringUtils.dueWeek(days);*/ int days = DateUtil.daysBetween(pat.getLastMenses(), new Date()); - this.nowWeeks = StringUtils.dueWeek(days); + //this.nowWeeks = StringUtils.dueWeek(days); setLastMenses(DateUtil.getyyyy_MM_dd(pat.getLastMenses())); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabySieveHandleTask.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabySieveHandleTask.java index 3b4ee64..05f8ed7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabySieveHandleTask.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabySieveHandleTask.java @@ -9,6 +9,7 @@ import com.lyms.platform.common.enums.SexEnum; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.ExceptionUtils; +import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.operate.web.facade.AntenatalExaminationFacade; import com.lyms.platform.operate.web.result.BabySieveManager; import com.lyms.platform.operate.web.result.HighScoreResult; @@ -26,6 +27,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Map; import java.util.concurrent.Callable; /** @@ -101,7 +103,7 @@ public class BabySieveHandleTask implements Callable { String jzShi = CommonsHelper.getName1(patients.getCityRegisterId(), basicConfigService); String jzXian = CommonsHelper.getName1(patients.getAreaRegisterId(), basicConfigService); String jzXiang = CommonsHelper.getName1(patients.getStreetRegisterId(), basicConfigService); - String address = patients.getAddress(); + String address = patients.getAddressRegister(); String jQquan = jzSheng+jzShi+jzXian+jzXiang+address; babySieveManager.setAdress(jQquan); babySieveManager.setPatientId(patients.getId()); @@ -112,6 +114,44 @@ public class BabySieveHandleTask implements Callable { babySieveManager.setAge(DateUtil.getAge(patients.getBirth())); } List babies = maternalDeliverModel.getBaby(); + + //分娩方式 + String deliveryMode = ""; + if (StringUtils.isNotEmpty(maternalDeliverModel.getDeliveryMode())) { + + StringBuilder sb = new StringBuilder(); + + Map m = JsonUtil.str2Obj(maternalDeliverModel.getDeliveryMode(), Map.class); + String fmfs = null; + if (m != null) { + Object b = m.get("fmfs"); + if (b != null) { + fmfs = b.toString(); + if (fmfs != null) { + if (fmfs.equals("1")) { + String fmName = FmTypeEnums.getFmNameById(fmfs); + sb.append(fmName); + if (null != m.get("scfs") && !"null".equals(m.get("scfs").toString())) { + sb.append(","); + String scfs = m.get("scfs").toString(); + sb.append(FmTypeEnums.getFmScNameById(scfs)); + } + deliveryMode = sb.toString(); + } else if (fmfs.equals("2")) { + String fmName = FmTypeEnums.getFmNameById(fmfs); + deliveryMode = fmName; + } + } + } + } + } + if (deliveryMode.contains("顺产")) { + babySieveManager.setDueType(deliveryMode); + } else { + babySieveManager.setDueType(deliveryMode); + babySieveManager.setOperationCause(maternalDeliverModel.getOperationCause() == null ? "--" : maternalDeliverModel.getOperationCause()); + } + if (org.apache.commons.collections.CollectionUtils.isNotEmpty(babies)) { for (MaternalDeliverModel.Baby baby : babies) { if(baby.getId() != null && baby.getId().equals(babyModel.getId())){ @@ -154,13 +194,13 @@ public class BabySieveHandleTask implements Callable { if (new Integer(1).equals(highRisk)) { babySieveManager.setHighRisk("高危"); } - String dueType = babySieveManager.getDueType(); + /*String dueType = babySieveManager.getDueType(); if ("1".equals(dueType)) { babySieveManager.setDueType("顺产"); } if ("2".equals(dueType)) { babySieveManager.setDueType("剖宫产"); - } + }*/ babySieveManager.setSieveStatus(StringUtils.isEmpty(babyModel.getSieveStatus()) ? "0" : babyModel.getSieveStatus()); babySieveManager.setmName(babyModel.getMname()); -- 1.8.3.1