diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java index 2a79118..814417a 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java @@ -54,6 +54,9 @@ public class SieveApplyOrderModel extends BaseModel { //采集医生 private String collectionDoctorId; + //采样孕周，打印功能使用 + private String caiyangyunzhou; + //采血日期 private Date collectionDate; @@ -300,6 +303,14 @@ public class SieveApplyOrderModel extends BaseModel { //孕妇筛查类型 0：一般；1：早中联合筛查孕妇 private Integer patientType; + public String getCaiyangyunzhou() { + return caiyangyunzhou; + } + + public void setCaiyangyunzhou(String caiyangyunzhou) { + this.caiyangyunzhou = caiyangyunzhou; + } + public Integer getIeStatus() { return ieStatus; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveResultModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveResultModel.java index fe2ddf0..23580f9 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveResultModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveResultModel.java @@ -48,7 +48,11 @@ public class SieveResultModel{ //hafp private String hafp; + //uE3 + private String uE3; + //uE3Mom + private String uE3Mom; //hCgMomhCgMom private String hcgMom; @@ -81,6 +85,22 @@ public class SieveResultModel{ */ private Integer printSize; + public String getuE3() { + return uE3; + } + + public void setuE3(String uE3) { + this.uE3 = uE3; + } + + public String getuE3Mom() { + return uE3Mom; + } + + public void setuE3Mom(String uE3Mom) { + this.uE3Mom = uE3Mom; + } + public String getLymsSieveId() { return lymsSieveId; } 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 8000a61..d469f0c 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 @@ -390,7 +390,11 @@ public class ApplyOrderFacade { public BaseResponse addOneSieveApplyOrder(SieveApplyOrderAddRequest sieveApplyOrderAddRequest, Integer userId) { SieveApplyOrderModel sieveApplyOrderModel = sieveApplyOrderAddRequest.convertToDataModel(); - + //根据采样时间算出采样孕周，根据B超时间算出B超孕周 + if(StringUtils.isNotEmpty(sieveApplyOrderAddRequest.getParentId())){ + Patients p = patientsService.findOnePatientById(sieveApplyOrderAddRequest.getParentId()); + yunZhouMth(sieveApplyOrderModel,p); + } String hospitalId = autoMatchFacade.getHospitalId(userId); //修改 if (StringUtils.isNotEmpty(sieveApplyOrderAddRequest.getId())) { @@ -441,11 +445,11 @@ public class ApplyOrderFacade { sieveApplyOrderModel.setParentId(parentId); sieveApplyOrderAddRequest.setParentId(parentId); Patients p = patientsService.findOnePatientById(parentId); - //加入产筛 patientsService.validata(p); } } + sieveApplyOrderModel.setCreated(new Date()); sieveApplyOrderModel.setHospitalId(hospitalId); @@ -569,6 +573,22 @@ public class ApplyOrderFacade { } /** + * 功能描述 根据采样时间算出采样孕周，根据B超时间算出B超孕周 + * @author 武涛涛 + * @date 2020/6/19 + */ + private void yunZhouMth(SieveApplyOrderModel sieveApplyOrderModel, Patients p) { + //打印需要 根据采样时间算出采样孕周 + if(sieveApplyOrderModel.getCollectionDate()!=null && p.getLastMenses()!=null){ + sieveApplyOrderModel.setCaiyangyunzhou(DateUtil.getWeekDesc(p.getLastMenses(),sieveApplyOrderModel.getBcCheckDate())); + } + // 根据B超时间算出B超孕周 + if(sieveApplyOrderModel.getBcCheckDate()!=null && p.getLastMenses()!=null){ + sieveApplyOrderModel.setUltrasonicNtWeek(DateUtil.getWeekDesc(p.getLastMenses(),sieveApplyOrderModel.getBcCheckDate())); + } + } + + /** * 检查标本号是否已存在 * * @param sieveApplyOrderModel diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index b5a8e3c..55c0ad3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -1083,6 +1083,7 @@ public class SieveFacade { result.put("fetusAbnormalInfo", sieveApply.getFetusAbnormalInfo()); result.put("sieveModel", sieveApply.getSieveModel()); result.put("ultrasonicNtWeek", sieveApply.getUltrasonicNtWeek()); + result.put("caiyangyunzhou", sieveApply.getCaiyangyunzhou()); result.put("ultrasonicNtVal", sieveApply.getUltrasonicNtVal()); result.put("serumScreeningRisk", sieveApply.getSerumScreeningRisk()); result.put("syndrome21", sieveApply.getSyndrome21()); @@ -1165,12 +1166,23 @@ public class SieveFacade { sieveResultInfo.put("examineName", CommonsHelper.getUserName(sieveResultModel.getExamineId(), usersService)); sieveResultInfo.put("checkerName", CommonsHelper.getUserName(sieveResultModel.getCheckerId(), usersService)); sieveResultInfo.put("reportTime", DateUtil.getyyyy_MM_dd(sieveResultModel.getResultTime())); - sieveResultInfo.put("lymsSieveresultId", sieveResultModel.getId());//产筛结果id sieveResultInfo.put("sampleInfoId", sieveResultModel.getSampleInfoId()); sieveResultInfo.put("sampleReportId", sieveResultModel.getSampleReportId()); sieveResultInfo.put("hasReport", sieveResultModel.getHasReport()); + sieveResultInfo.put("uE3",sieveResultModel.getuE3() != null ? sieveResultModel.getuE3() + "ng/ml" : ""); + sieveResultInfo.put("uE3Mom",sieveResultModel.getuE3Mom() != null ? sieveResultModel.getuE3Mom() : ""); + if(!sieveResultModel.getTszhzValue().isEmpty()){//21-三体 + sieveResultInfo.put("tszhzValue", sieveResultModel.getTszhzValue()); + } + if(!sieveResultModel.getSbstValue().isEmpty()){//18-三体 + sieveResultInfo.put("sbstValue", sieveResultModel.getSbstValue()); + } + if(!sieveResultModel.getStzhz13Value().isEmpty()){// 神经管畸形 NTD + sieveResultInfo.put("stzhz13Value", sieveResultModel.getStzhz13Value()); + } + String tszhzValue = ""; if (StringUtils.isNotEmpty(sieveResultModel.getTszhz()) && sieveResultModel.getTszhzValue() != null && sieveResultModel.getTszhzValue().size() > 0) { @@ -2757,14 +2769,21 @@ public class SieveFacade { if (StringUtils.isNotEmpty(importResult.gethCGb浓度())) {//hCGb浓度 sieveAddRequest.setHcg(importResult.gethCGb浓度()); } - if (StringUtils.isNotEmpty(importResult.getAFP校正MOM值())) {//AFP校正MOM值 - sieveAddRequest.setHafpMom(importResult.getAFP校正MOM值()); + if (StringUtils.isNotEmpty(importResult.gethCGb校正MOM值())) {//hCGb校正MOM值 + sieveAddRequest.setHcgMom(importResult.gethCGb校正MOM值()); } + if (StringUtils.isNotEmpty(importResult.getAFP浓度())) {//AFP浓度 sieveAddRequest.setHafp(importResult.getAFP浓度()); } - if (StringUtils.isNotEmpty(importResult.gethCGb校正MOM值())) {//hCGb校正MOM值 - sieveAddRequest.setHcgMom(importResult.gethCGb校正MOM值()); + if (StringUtils.isNotEmpty(importResult.getAFP校正MOM值())) {//AFP校正MOM值 + sieveAddRequest.setHafpMom(importResult.getAFP校正MOM值()); + } + if(StringUtils.isNotEmpty(importResult.getuE3UPDCN浓度())){ //uE3 + sieveAddRequest.setuE3(importResult.getuE3UPDCN浓度()); + } + if(StringUtils.isNotEmpty(importResult.getuE3UPDCN校正MOM值())){ //uE3MOM + sieveAddRequest.setuE3(importResult.getuE3UPDCN校正MOM值()); } //sieveAddRequest.setCheckerId(); //sieveAddRequest.setExamineId(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java index c279bad..d47379c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java @@ -45,6 +45,10 @@ public class SieveAddRequest implements IBasicRequestConvert { //hafp private String hafp; + //uE3 + private String uE3; + //uE3Mom + private String uE3Mom; //hCgMom private String hcgMom; @@ -60,6 +64,22 @@ public class SieveAddRequest implements IBasicRequestConvert { private String reportType; + public String getuE3() { + return uE3; + } + + public void setuE3(String uE3) { + this.uE3 = uE3; + } + + public String getuE3Mom() { + return uE3Mom; + } + + public void setuE3Mom(String uE3Mom) { + this.uE3Mom = uE3Mom; + } + public String getLymsSieveId() { return lymsSieveId; } @@ -267,6 +287,8 @@ public class SieveAddRequest implements IBasicRequestConvert { sieveModel.setHcgMom(hcgMom); sieveModel.setHafp(hafp); sieveModel.setHafpMom(hafpMom); + sieveModel.setuE3Mom(uE3Mom); + sieveModel.setuE3(uE3); sieveModel.setExamineId(examineId); sieveModel.setCheckerId(checkerId); sieveModel.setReportType(reportType); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java index c9deca5..3081262 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java @@ -482,7 +482,11 @@ public class SieveApplyOrderAddRequest implements IBasicRequestConvert