diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java index 26b027d..5c77529 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java @@ -146,6 +146,9 @@ public class PatientsService { }**/ } + private void delSieve(){ + + } /** * 孕妇建档时调用的方法 * @@ -161,6 +164,7 @@ public class PatientsService { List list = sieveDao.queryList(sieveQuery.convertToQuery()); if (CollectionUtils.isEmpty(list)) { SieveModel sieveModel = convertToModel(patients); + sieveModel.setForm("1"); sieveDao.addChanQianSieve(sieveModel); } } @@ -219,6 +223,7 @@ public class PatientsService { List list = sieveDao.queryList(sieveQuery.convertToQuery()); if (CollectionUtils.isEmpty(list)) { SieveModel sieveModel = convertToModel(patient); + sieveModel.setForm("0"); sieveDao.addChanQianSieve(sieveModel); } } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java index 4a16b24..7e61084 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java @@ -45,11 +45,21 @@ public class SieveModel extends BaseModel { private String diaUnit; //录入人员 private String publishName; + //数据来源 0 自动跑进来的 1 建档进来 2 产筛申请进来 + private String form; private Date created; private Date modified; private Integer yn; + public String getForm() { + return form; + } + + public void setForm(String form) { + this.form = form; + } + public String getHospitalId() { return hospitalId; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index f8ea628..acd11af 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -133,6 +133,7 @@ public class ApplyOrderFacade { Patients patients = patientsService.findOnePatientById(orderModel.getParentId()); if (null != patients) { SieveModel sieveModel = patientsService.convertToModel(patients); + sieveModel.setForm("2"); sieveModel.setHospitalId(orderModel.getHospitalId()); sieveService.addChanQianSieve(sieveModel); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java index a25fd1a..1832db0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java @@ -1,6 +1,5 @@ package com.lyms.platform.operate.web.result; -import com.lyms.platform.common.base.IBasicResultConvert; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.pojo.MaternalDeliverModel; import com.lyms.platform.pojo.Patients; @@ -12,10 +11,10 @@ import java.util.List; /** * 分娩信息记录表 - * + *

* Created by Administrator on 2016/6/17 0017. */ -public class MatDeliverListResult { +public class MatDeliverListResult { private String id; //名字 @@ -29,7 +28,7 @@ public class MatDeliverListResult { //手机号 private String phone; //高危因素 - private List riskFactor; + private List riskFactor; public List getRiskFactor() { return riskFactor; @@ -55,32 +54,32 @@ public class MatDeliverListResult { this.tireNumber1 = tireNumber1; } - public MatDeliverListResult convertToResult(List destList,Patients patients) { + public MatDeliverListResult convertToResult(List destList, Patients patients) { setId(patients.getId()); try { - if(null!=patients.getBirth()){ + if (null != patients.getBirth()) { setAge(DateUtil.getAge(patients.getBirth())); } - }catch (Exception e){ + } catch (Exception e) { } - if(null!=patients.getLastMenses()){ + if (null != patients.getLastMenses()) { setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses())); } - if(null!=patients.getDueDate()){ + if (null != patients.getDueDate()) { setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate())); } setName(patients.getUsername()); setPhone(patients.getPhone()); setRemarks(patients.getMremark()); setRiskScore("60"); - int days= DateUtil.daysBetween(patients.getLastMenses(),new Date()); - String week= (days/7)+""; - int day = (days%7); - this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":""); - if(CollectionUtils.isNotEmpty(destList)){ - List list = new ArrayList<>(); - for(MaternalDeliverModel model:destList){ - list.add(new MatDeliverExt(model)); + int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); + String week = (days / 7) + ""; + int day = (days % 7); + this.dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""); + if (CollectionUtils.isNotEmpty(destList)) { + List list = new ArrayList<>(); + for (MaternalDeliverModel model : destList) { + list.add(new MatDeliverExt(model,patients.getCreated())); } setData(list); } @@ -172,17 +171,30 @@ public class MatDeliverListResult { this.yChanQi = yChanQi; } - private class MatDeliverExt{ + private class MatDeliverExt { private String hospitalName; private String hospitalId; private String id; private String checkTime; + private String enableEdit = "0"; - public MatDeliverExt(MaternalDeliverModel deliverModel){ + public MatDeliverExt(MaternalDeliverModel deliverModel, Date lastCreatedTime) { setCheckTime(deliverModel.getDueDate()); setId(deliverModel.getId()); setHospitalId(deliverModel.getHospitalId()); setHospitalName(deliverModel.getFmHospital()); + if (null != deliverModel.getDueDate()) { + Date date = DateUtil.parseYMD(deliverModel.getDueDate()); + setEnableEdit(date.after(lastCreatedTime) ? "1" : "0"); + } + } + + public String getEnableEdit() { + return enableEdit; + } + + public void setEnableEdit(String enableEdit) { + this.enableEdit = enableEdit; } public String getHospitalId() {