From bc87b01de26420f583ac5b4a1c67d6a7d4deca58 Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Wed, 8 Nov 2017 11:33:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/common/enums/BasisEnums.java | 51 ++++++++++++++++++++++ .../java/com/lyms/platform/pojo/AntExChuModel.java | 30 +++++++++++++ .../platform/pojo/AntenatalExaminationModel.java | 21 +++++++++ .../main/java/com/lyms/platform/pojo/Patients.java | 33 ++++++++++++++ .../operate/web/controller/ViewController.java | 28 ++++++++++++ .../operate/web/facade/BookbuildingFacade.java | 16 +++++++ .../platform/operate/web/facade/ViewFacade.java | 43 +++++++++++++++++- .../operate/web/request/AntExAddRequest.java | 12 +++++ .../operate/web/request/AntExcAddRequest.java | 21 +++++++++ .../web/request/YunBookbuildingAddRequest.java | 34 ++++++++++++++- .../operate/web/result/PregnantInfoResult.java | 31 +++++++++++++ 11 files changed, 317 insertions(+), 3 deletions(-) create mode 100644 platform-common/src/main/java/com/lyms/platform/common/enums/BasisEnums.java diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/BasisEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/BasisEnums.java new file mode 100644 index 0000000..fc20053 --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/BasisEnums.java @@ -0,0 +1,51 @@ +package com.lyms.platform.common.enums; + +import com.lyms.platform.common.utils.StringUtils; + +/** + * 纠正依据 + */ +public enum BasisEnums { + A("1", "早孕B超"), + B("2", "排卵日期"), + C("3", "同房日期"), + D("4", "中孕B超"); + + BasisEnums(String id, String name) { + this.id = id; + this.name = name; + } + + + public static String getName(String id) { + if(StringUtils.isEmpty(id)) { + return null; + } + BasisEnums[] values = BasisEnums.values(); + for (BasisEnums value : values) { + if (value.getId().equals(id)) { + return value.getName(); + } + } + return null; + } + private String id; + private String name; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + +} diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java index b0c3438..3a782aa 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java @@ -18,6 +18,36 @@ public class AntExChuModel extends BaseModel { private static final long serialVersionUID = SerialIdEnum.AntExChuModel.getCid(); + private String genRemark; // 一般检查备注 + private String gynRemark; // 妇科检查备注 + + public String getGenRemark() { + return genRemark; + } + + public void setGenRemark(String genRemark) { + this.genRemark = genRemark; + } + + public String getGynRemark() { + return gynRemark; + } + + public void setGynRemark(String gynRemark) { + this.gynRemark = gynRemark; + } + + /** 是否打印过 1=已打印 有这个字段就算打印 */ + private Integer isPrient; + + public Integer getIsPrient() { + return isPrient; + } + + public void setIsPrient(Integer isPrient) { + this.isPrient = isPrient; + } + /** 处理意见 */ private Map> treatmentOpinion2; private List treatmentOpinion2Types; diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java index 3088841..a1b3e43 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java @@ -16,6 +16,27 @@ import java.util.Map; @Document(collection = "lyms_antex") public class AntenatalExaminationModel extends BaseModel { + private String genRemark; // 一般检查备注 + + public String getGenRemark() { + return genRemark; + } + + public void setGenRemark(String genRemark) { + this.genRemark = genRemark; + } + + /** 是否打印过 1=已打印 有这个字段就算打印 */ + private Integer isPrient; + + public Integer getIsPrient() { + return isPrient; + } + + public void setIsPrient(Integer isPrient) { + this.isPrient = isPrient; + } + private static final long serialVersionUID = SerialIdEnum.AntenatalExaminationModel.getCid(); List mHighRiskReason; diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index cdf9cdb..315b3f6 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -17,6 +17,39 @@ public class Patients extends BaseModel { private static final long serialVersionUID = SerialIdEnum.Patients.getCid(); + + // 末次月经纠正依据 + private String lastMenstrualPeriodBasis; + // 末次月经纠正医生ID + private String lastMenstrualPeriodBasisDoctorId; + // 末次月经纠正时间 + private String lastMenstrualPeriodBasisDate; + + public String getLastMenstrualPeriodBasis() { + return lastMenstrualPeriodBasis; + } + + public void setLastMenstrualPeriodBasis(String lastMenstrualPeriodBasis) { + this.lastMenstrualPeriodBasis = lastMenstrualPeriodBasis; + } + + public String getLastMenstrualPeriodBasisDoctorId() { + return lastMenstrualPeriodBasisDoctorId; + } + + public void setLastMenstrualPeriodBasisDoctorId(String lastMenstrualPeriodBasisDoctorId) { + this.lastMenstrualPeriodBasisDoctorId = lastMenstrualPeriodBasisDoctorId; + } + + public String getLastMenstrualPeriodBasisDate() { + return lastMenstrualPeriodBasisDate; + } + + public void setLastMenstrualPeriodBasisDate(String lastMenstrualPeriodBasisDate) { + this.lastMenstrualPeriodBasisDate = lastMenstrualPeriodBasisDate; + } + + // 月经周期开始天数 private String mensStartDay; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java index a5d8eb7..9116a01 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java @@ -33,6 +33,34 @@ public class ViewController extends BaseController { @Autowired private AntenatalExaminationFacade antenatalExaminationFacade; + + /** + * 获取初诊复诊是否打印过 + * type = 1 初诊 + * type = 2 复诊 + */ + @RequestMapping(value = "/get/prient", method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public BaseObjectResponse getIsPrient(@RequestParam String id, @RequestParam Integer type) { + return viewFacade.getIsPrient(id, type); + } + + /** + * 初诊复诊打印后回调controller + * type = 1 初诊 + * type = 2 复诊 + */ + @RequestMapping(value = "/prient", method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public BaseObjectResponse prient(@RequestParam String id, @RequestParam Integer type) { + return viewFacade.prient(id, type); + } + + + + /** * 查询初诊接口 * diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index c3622de..a9cb742 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -17,6 +17,7 @@ import com.lyms.platform.operate.web.request.*; import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.utils.JdbcUtil; import com.lyms.platform.operate.web.utils.MessageCenterService; +import com.lyms.platform.permission.dao.master.CouponMapper; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.OrganizationQuery; import com.lyms.platform.permission.model.Users; @@ -97,6 +98,9 @@ public class BookbuildingFacade { @Autowired private DzfyHisService dzfyHisService; + @Autowired + private CouponMapper couponMapper; + @Autowired private DeleteProcessHandler deleteProcessHandler; @@ -202,6 +206,7 @@ public class BookbuildingFacade { } } + PersonModel resperson = null; if (StringUtils.isNotEmpty(yunRequest.getPregnantCertificateNum())) { @@ -1092,6 +1097,10 @@ public class BookbuildingFacade { public Patients getPatientsData(YunBookbuildingAddRequest yunRequest) { Patients patient = new Patients(); + patient.setLastMenstrualPeriodBasis(yunRequest.getLastMenstrualPeriodBasis()); + patient.setLastMenstrualPeriodBasisDoctorId(yunRequest.getLastMenstrualPeriodBasisDoctorId()); + patient.setLastMenstrualPeriodBasisDate(yunRequest.getLastMenstrualPeriodBasisDate()); + patient.setMensStartDay(yunRequest.getMensStartDay()); patient.setMensEndDay(yunRequest.getMensEndDay()); @@ -1234,6 +1243,13 @@ public class BookbuildingFacade { public PregnantInfoResult getResult(Patients p) { PregnantInfoResult result = new PregnantInfoResult(); + + + result.setLastMenstrualPeriodBasis(p.getLastMenstrualPeriodBasis()); + result.setLastMenstrualPeriodBasisDoctorId(couponMapper.getUserName(p.getLastMenstrualPeriodBasisDoctorId())); + result.setLastMenstrualPeriodBasisDate(p.getLastMenstrualPeriodBasisDate()); + + result.setMensStartDay(p.getMensStartDay()); result.setMensEndDay(p.getMensEndDay()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 5c83a05..9063b82 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -4,6 +4,7 @@ import com.lyms.platform.biz.service.*; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.*; import com.lyms.platform.common.result.BaseObjectResponse; +import com.lyms.platform.common.result.RespBuilder; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.ExceptionUtils; import com.lyms.platform.common.utils.JsonUtil; @@ -29,6 +30,10 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; +import org.springframework.data.mongodb.core.MongoTemplate; +import org.springframework.data.mongodb.core.query.Criteria; +import org.springframework.data.mongodb.core.query.Query; +import org.springframework.data.mongodb.core.query.Update; import org.springframework.stereotype.Component; import java.util.*; @@ -89,6 +94,9 @@ public class ViewFacade { @Autowired private YunBookbuildingService yunBookbuildingService; + @Autowired + private MongoTemplate mongoTemplate; + /** * 建档查询 @@ -1137,6 +1145,9 @@ public class ViewFacade { Map map = new HashMap<>(); + + map.put("lastMenses", data.getLastMenses()); + map.put("treatmentOpinion2Types", mongoUtil.findPlatValues(data.getTreatmentOpinion2Types())); // map.put("treatmentOpinion2", mongoUtil.findPlatList2(data.getTreatmentOpinion2())); map.put("treatmentOpinion3", getTreatmentOpinion3(data.getTreatmentOpinion2())); @@ -1564,7 +1575,8 @@ public class ViewFacade { } if (placenta.getGjkd() != null) { - placetaMap.put("gjkd", UnitUtils.unitSplice(placenta.getGjkd(), UnitConstants.CM)); + placetaMap.put("gjkd", UnitUtils.unitSplice(placenta.getGjkd(), "")); +// placetaMap.put("gjkd", UnitUtils.unitSplice(placenta.getGjkd(), UnitConstants.CM)); } if (placenta.getGjrs() != null) { @@ -1811,6 +1823,8 @@ public class ViewFacade { Map map = new HashMap<>(); + map.put("lastMenses", data.getLastMenses()); + /* 基本信息 */ //孕妇基本信息 map.put("id", data.getId()); @@ -1959,7 +1973,8 @@ public class ViewFacade { } if (tire.get("gjkd") != null) { - tireMap.put("gjkd", UnitUtils.unitSplice(tire.get("gjkd"), UnitConstants.CM)); + tireMap.put("gjkd", UnitUtils.unitSplice(tire.get("gjkd"), "")); +// tireMap.put("gjkd", UnitUtils.unitSplice(tire.get("gjkd"), UnitConstants.CM)); } if (tire.get("gjrs") != null) { @@ -3671,4 +3686,28 @@ public class ViewFacade { } return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("未查询到数据"); } + + public BaseObjectResponse getIsPrient(String id, Integer type) { + if(type == 1) { + AntExChuModel chuModel = mongoTemplate.findById(id, AntExChuModel.class); + if(chuModel != null) { + return RespBuilder.buildSuccess("isPrient", chuModel.getIsPrient() == null ? false : true); + } + } else if (type == 2){ + AntenatalExaminationModel examinationModel = mongoTemplate.findById(id, AntenatalExaminationModel.class); + if(examinationModel != null) { + return RespBuilder.buildSuccess("isPrient", examinationModel.getIsPrient() == null ? false : true); + } + } + return RespBuilder.buildSuccess((type == 1 ? "初诊" : "复诊") + "数据未找到"); + } + + public BaseObjectResponse prient(String id, Integer type) { + if(type == 1) { + mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(id)), Update.update("isPrient", 1), AntExChuModel.class); + } else if (type == 2){ + mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(id)), Update.update("isPrient", 1), AntenatalExaminationModel.class); + } + return RespBuilder.buildSuccess(flag); + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java index 9201f35..4309530 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java @@ -15,6 +15,17 @@ import java.util.Map; */ @Form public class AntExAddRequest implements IBasicRequestConvert { + + private String genRemark; // 一般检查备注 + + public String getGenRemark() { + return genRemark; + } + + public void setGenRemark(String genRemark) { + this.genRemark = genRemark; + } + List mHighRiskReason; public List getmHighRiskReason() { @@ -307,6 +318,7 @@ public class AntExAddRequest implements IBasicRequestConvert { + private String genRemark; // 一般检查备注 + private String gynRemark; // 妇科检查备注 + + public String getGenRemark() { + return genRemark; + } + + public void setGenRemark(String genRemark) { + this.genRemark = genRemark; + } + + public String getGynRemark() { + return gynRemark; + } + + public void setGynRemark(String gynRemark) { + this.gynRemark = gynRemark; + } + List mHighRiskReason; private String cweight; @@ -1296,6 +1315,8 @@ public class AntExcAddRequest implements IBasicRequestConvert { public AntExChuModel convertToDataModel() { AntExChuModel antExChuModel = new AntExChuModel(); + antExChuModel.setGenRemark(genRemark); + antExChuModel.setGynRemark(gynRemark); antExChuModel.setTreatmentOpinion2(treatmentOpinion2); antExChuModel.setTreatmentOpinion2Types(treatmentOpinion2Types); antExChuModel.setQuicken(quicken); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java index 07df60d..b289ba2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java @@ -9,7 +9,39 @@ import org.hibernate.validator.constraints.NotEmpty; */ @Form public class YunBookbuildingAddRequest { - /***********孕妇基本信息***********/ + + // 末次月经纠正依据 + private String lastMenstrualPeriodBasis; + // 末次月经纠正医生ID + private String lastMenstrualPeriodBasisDoctorId; + // 末次月经纠正时间 + private String lastMenstrualPeriodBasisDate; + + public String getLastMenstrualPeriodBasis() { + return lastMenstrualPeriodBasis; + } + + public void setLastMenstrualPeriodBasis(String lastMenstrualPeriodBasis) { + this.lastMenstrualPeriodBasis = lastMenstrualPeriodBasis; + } + + public String getLastMenstrualPeriodBasisDoctorId() { + return lastMenstrualPeriodBasisDoctorId; + } + + public void setLastMenstrualPeriodBasisDoctorId(String lastMenstrualPeriodBasisDoctorId) { + this.lastMenstrualPeriodBasisDoctorId = lastMenstrualPeriodBasisDoctorId; + } + + public String getLastMenstrualPeriodBasisDate() { + return lastMenstrualPeriodBasisDate; + } + + public void setLastMenstrualPeriodBasisDate(String lastMenstrualPeriodBasisDate) { + this.lastMenstrualPeriodBasisDate = lastMenstrualPeriodBasisDate; + } + + /***********孕妇基本信息***********/ // 月经周期开始天数 private String mensStartDay; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java index 7607843..6f2ca04 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java @@ -7,6 +7,37 @@ import java.util.Map; */ public class PregnantInfoResult { + // 末次月经纠正依据 + private String lastMenstrualPeriodBasis; + // 末次月经纠正医生ID + private String lastMenstrualPeriodBasisDoctorId; + // 末次月经纠正时间 + private String lastMenstrualPeriodBasisDate; + + public String getLastMenstrualPeriodBasis() { + return lastMenstrualPeriodBasis; + } + + public void setLastMenstrualPeriodBasis(String lastMenstrualPeriodBasis) { + this.lastMenstrualPeriodBasis = lastMenstrualPeriodBasis; + } + + public String getLastMenstrualPeriodBasisDoctorId() { + return lastMenstrualPeriodBasisDoctorId; + } + + public void setLastMenstrualPeriodBasisDoctorId(String lastMenstrualPeriodBasisDoctorId) { + this.lastMenstrualPeriodBasisDoctorId = lastMenstrualPeriodBasisDoctorId; + } + + public String getLastMenstrualPeriodBasisDate() { + return lastMenstrualPeriodBasisDate; + } + + public void setLastMenstrualPeriodBasisDate(String lastMenstrualPeriodBasisDate) { + this.lastMenstrualPeriodBasisDate = lastMenstrualPeriodBasisDate; + } + // 月经周期开始天数 private String mensStartDay; -- 1.8.3.1