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 12b8bee..e2123b9 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 @@ -254,6 +254,195 @@ public class SieveApplyOrderModel extends BaseModel { */ private boolean huaDaPushResult; + //iAssistantl数据传输格式说明,导出excel自动不足添加在此处，让前端输入 + //孕妇编号 30个字符以内，只能包含字母，数字，下划线和短杠 + private String PatientID; + //申请单号 + private String ApplicationNo; + //吸烟 0：不吸烟；-1或空字符串：未知;1：吸烟；3：妊娠期间终止;2:妊娠前终止 + private Integer Smoking; + //I-型糖尿病 <空>：未知；0：无;1:有 + private Integer Insulin; + private Integer HC; + //B超孕天 如果7W2D，此处应填5 + private Integer MannualEntry; + //如果有NT，则必须有 + private Integer NT; + //送检单位编号 30个字符以内，只能包含字母，数字，下划线和短杠 + private String ResponsibleCode; + //既往T21 <空>：未知；0：无;1:有 + private Integer T21; + //既往T18 <空>：未知；0：无;1:有 + private Integer T18; + //既往NTD <空>：未知；0：无;1:有 + private Integer NTD; + //辅助生殖方法 <空>：未知； + //3：克罗米芬治疗；//1：配子输卵管内移植； + //4：捐赠卵子； //6：卵细胞浆内单精子注射； + //5：捐赠受精；//0：体外受精； + //7：其他；//2：合子输卵管内移植 + private Integer ARMethod; + //辅助生殖之提取日期 若输入了ARMethod，此项必填 + private Date ExtractionDate; + // 辅助生殖之移植日期 若输入了ARMethod，此项必填 + private Date TransferDate; + //辅助生殖之捐赠者生日 若输入了ARMethod，此项必填 + private Date DonorBirthDate; + //鼻骨 <空>：未知；1：未显;2:显示 + private Integer NasalBone; + //单卵 0：否;1：是 + private Integer Monozygous; + //孕妇筛查类型 0：一般；1：早中联合筛查孕妇 + private Integer PatientType; + + public static long getSerialVersionUID() { + return serialVersionUID; + } + + public String getPatientID() { + return PatientID; + } + + public void setPatientID(String patientID) { + PatientID = patientID; + } + + public String getApplicationNo() { + return ApplicationNo; + } + + public void setApplicationNo(String applicationNo) { + ApplicationNo = applicationNo; + } + + public Integer getSmoking() { + return Smoking; + } + + public void setSmoking(Integer smoking) { + Smoking = smoking; + } + + public Integer getInsulin() { + return Insulin; + } + + public void setInsulin(Integer insulin) { + Insulin = insulin; + } + + public Integer getHC() { + return HC; + } + + public void setHC(Integer HC) { + this.HC = HC; + } + + public Integer getMannualEntry() { + return MannualEntry; + } + + public void setMannualEntry(Integer mannualEntry) { + MannualEntry = mannualEntry; + } + + public Integer getNT() { + return NT; + } + + public void setNT(Integer NT) { + this.NT = NT; + } + + public String getResponsibleCode() { + return ResponsibleCode; + } + + public void setResponsibleCode(String responsibleCode) { + ResponsibleCode = responsibleCode; + } + + public Integer getT21() { + return T21; + } + + public void setT21(Integer t21) { + T21 = t21; + } + + public Integer getT18() { + return T18; + } + + public void setT18(Integer t18) { + T18 = t18; + } + + public Integer getNTD() { + return NTD; + } + + public void setNTD(Integer NTD) { + this.NTD = NTD; + } + + public Integer getARMethod() { + return ARMethod; + } + + public void setARMethod(Integer ARMethod) { + this.ARMethod = ARMethod; + } + + public Date getExtractionDate() { + return ExtractionDate; + } + + public void setExtractionDate(Date extractionDate) { + ExtractionDate = extractionDate; + } + + public Date getTransferDate() { + return TransferDate; + } + + public void setTransferDate(Date transferDate) { + TransferDate = transferDate; + } + + public Date getDonorBirthDate() { + return DonorBirthDate; + } + + public void setDonorBirthDate(Date donorBirthDate) { + DonorBirthDate = donorBirthDate; + } + + public Integer getNasalBone() { + return NasalBone; + } + + public void setNasalBone(Integer nasalBone) { + NasalBone = nasalBone; + } + + public Integer getMonozygous() { + return Monozygous; + } + + public void setMonozygous(Integer monozygous) { + Monozygous = monozygous; + } + + public Integer getPatientType() { + return PatientType; + } + + public void setPatientType(Integer patientType) { + PatientType = patientType; + } + public String getRedundancy() { return redundancy; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java index c7c80ea..5daf381 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java @@ -103,6 +103,7 @@ public class SieveController extends BaseController { *

* type 1 查看 2 产筛申请修改 3 结果看 4，产筛结果修改查询 * + * @param id == cqsieves 列表中的id * @param parentId * @param request * @return @@ -110,9 +111,9 @@ public class SieveController extends BaseController { @ResponseBody @TokenRequired @RequestMapping(value = "/getSieveApplyInfo", method = RequestMethod.GET) - public BaseResponse getSieveApplyInfo(@RequestParam("parentId") String parentId, @RequestParam(required = true) Integer type, HttpServletRequest request) { + public BaseResponse getSieveApplyInfo(@RequestParam("parentId") String parentId,@RequestParam(required = false)String id, @RequestParam(required = true)Integer type, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return sieveFacade.getSieveApplyInfo(parentId, loginState.getId(), type); + return sieveFacade.getSieveApplyInfo(parentId, id,loginState.getId(), type); } 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 4ef33d7..902e596 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 @@ -400,6 +400,9 @@ public class ApplyOrderFacade { SieveQuery sieveQuery = new SieveQuery(); sieveQuery.setYn(YnEnums.YES.getId()); sieveQuery.setParentId(sieveApplyOrderAddRequest.getParentId()); + if(StringUtils.isNotEmpty(sieveApplyOrderAddRequest.getRedundancy())){ + sieveQuery.setId(sieveApplyOrderAddRequest.getRedundancy()); + } List sieveModels = sieveService.queryList(sieveQuery); if (CollectionUtils.isNotEmpty(sieveModels)) { SieveModel sieveModel = sieveModels.get(0); 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 066a771..433eeea 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 @@ -145,6 +145,9 @@ public class SieveFacade { public void addOrUpdateSieveModel(SieveAddRequest sieveAddRequest, Integer userId, SieveResultModel sieveResultModel) { SieveQuery sieveQuery = new SieveQuery(); sieveQuery.setParentId(sieveAddRequest.getParentId()); + if(StringUtils.isNotEmpty(sieveAddRequest.getRedundancy())){ + sieveQuery.setId(sieveAddRequest.getRedundancy()); + } sieveQuery.setYn(YnEnums.YES.getId()); List list = sieveService.queryList(sieveQuery); @@ -777,7 +780,7 @@ public class SieveFacade { return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(patientBaseResult); } - public BaseResponse getSieveApplyInfo(String parentId, Integer userId, Integer type) { + public BaseResponse getSieveApplyInfo(String parentId,String id, Integer userId, Integer type) { Map map = new HashMap<>(); //String hospitalId = autoMatchFacade.getHospitalId(userId); @@ -790,7 +793,9 @@ public class SieveFacade { SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery(); sieveApplyOrderQuery1.setParentId(parentId); - + if(StringUtils.isNotEmpty(id)){ + sieveApplyOrderQuery1.setRedundancy(id);//20200609 wtt,使用产筛申请单id查询因为这里会有多个不是单个 + } sieveApplyOrderQuery1.setYn(YnEnums.YES.getId()); if (CollectionUtils.isNotEmpty(localPatients)) { @@ -849,9 +854,29 @@ public class SieveFacade { Map viewInfo = new HashMap<>(); SieveApplyOrderModel sieveApply = sieveApplyOrderModels.get(0); + //iAssistantl数据传输格式说明,导出excel自动不足添加在此处 + result.put("PatientID", sieveApply.getPatientID()); + result.put("ApplicationNo", sieveApply.getApplicationNo()); + result.put("Smoking", sieveApply.getSmoking()); + result.put("Insulin", sieveApply.getInsulin()); + result.put("HC", sieveApply.getHC()); + result.put("MannualEntry", sieveApply.getMannualEntry()); + result.put("NT", sieveApply.getNT()); + result.put("ResponsibleCode", sieveApply.getResponsibleCode()); + result.put("T21", sieveApply.getT21()); + result.put("T18", sieveApply.getT18()); + result.put("NTD", sieveApply.getNTD()); + result.put("ARMethod", sieveApply.getARMethod()); + result.put("ExtractionDate", DateUtil.getyyyy_MM_dd(sieveApply.getExtractionDate())); + result.put("TransferDate", DateUtil.getyyyy_MM_dd(sieveApply.getTransferDate())); + result.put("DonorBirthDate", DateUtil.getyyyy_MM_dd(sieveApply.getDonorBirthDate())); + result.put("NasalBone", sieveApply.getNasalBone()); + result.put("Monozygous", sieveApply.getMonozygous()); + result.put("PatientType", sieveApply.getPatientType()); + + result.put("id", sieveApply.getId()); result.put("parentId", sieveApply.getParentId()); - result.put("check", sieveApply.getCheckItem()); result.put("guide", sieveApply.getGuide()); result.put("checkDate", sieveApply.getCheckDate()); @@ -910,7 +935,9 @@ public class SieveFacade { result.put("gxbzl", sieveApply.getGxbzl()); result.put("jzsInfo", sieveApply.getJzsInfo()); result.put("ypglx", sieveApply.getYpglx()); - + if(StringUtils.isNotEmpty(id)){ + result.put("redundancy", id); + } result.put("nf", sieveApply.getNf()); if (type == 1) { 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 4b31f60..b752bf1 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 @@ -20,6 +20,7 @@ public class SieveAddRequest implements IBasicRequestConvert { private String id; private String parentId; + private String redundancy; private String tszhz;// 唐氏综合症 21-三体 private String sjgjx;// 神经管畸形 NTD @@ -58,6 +59,14 @@ public class SieveAddRequest implements IBasicRequestConvert { private String reportType; + public String getRedundancy() { + return redundancy; + } + + public void setRedundancy(String redundancy) { + this.redundancy = redundancy; + } + public String getReportType() { return 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 b1c66fb..57f5263 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 @@ -88,6 +88,8 @@ public class SieveApplyOrderAddRequest implements IBasicRequestConvert：未知；0：无;1:有 + private Integer insulin; + private Integer hC; + //B超孕天 如果7W2D，此处应填5 + private Integer mannualEntry; + //如果有NT，则必须有 + private Integer nT; + //送检单位编号 30个字符以内，只能包含字母，数字，下划线和短杠 + private String responsibleCode; + //既往T21 <空>：未知；0：无;1:有 + private Integer t21; + //既往T18 <空>：未知；0：无;1:有 + private Integer t18; + //既往NTD <空>：未知；0：无;1:有 + private Integer nTD; + //辅助生殖方法 <空>：未知； + //3：克罗米芬治疗；//1：配子输卵管内移植； + //4：捐赠卵子； //6：卵细胞浆内单精子注射； + //5：捐赠受精；//0：体外受精； + //7：其他；//2：合子输卵管内移植 + private Integer aRMethod; + //辅助生殖之提取日期 若输入了ARMethod，此项必填 + private String extractionDate; + // 辅助生殖之移植日期 若输入了ARMethod，此项必填 + private String transferDate; + //辅助生殖之捐赠者生日 若输入了ARMethod，此项必填 + private String donorBirthDate; + //鼻骨 <空>：未知；1：未显;2:显示 + private Integer nasalBone; + //单卵 0：否;1：是 + private Integer monozygous; + //孕妇筛查类型 0：一般；1：早中联合筛查孕妇 + private Integer patientType; + + public String getPatientID() { + return patientID; + } + + public void setPatientID(String patientID) { + this.patientID = patientID; + } + + public String getApplicationNo() { + return applicationNo; + } + + public void setApplicationNo(String applicationNo) { + this.applicationNo = applicationNo; + } + + public Integer getSmoking() { + return smoking; + } + + public void setSmoking(Integer smoking) { + this.smoking = smoking; + } + + public Integer getInsulin() { + return insulin; + } + + public void setInsulin(Integer insulin) { + this.insulin = insulin; + } + + public Integer gethC() { + return hC; + } + + public void sethC(Integer hC) { + this.hC = hC; + } + + public Integer getMannualEntry() { + return mannualEntry; + } + + public void setMannualEntry(Integer mannualEntry) { + this.mannualEntry = mannualEntry; + } + + public Integer getnT() { + return nT; + } + + public void setnT(Integer nT) { + this.nT = nT; + } + + public String getResponsibleCode() { + return responsibleCode; + } + + public void setResponsibleCode(String responsibleCode) { + this.responsibleCode = responsibleCode; + } + + public Integer getT21() { + return t21; + } + + public void setT21(Integer t21) { + this.t21 = t21; + } + + public Integer getT18() { + return t18; + } + + public void setT18(Integer t18) { + this.t18 = t18; + } + + public Integer getnTD() { + return nTD; + } + + public void setnTD(Integer nTD) { + this.nTD = nTD; + } + + public Integer getaRMethod() { + return aRMethod; + } + + public void setaRMethod(Integer aRMethod) { + this.aRMethod = aRMethod; + } + + public String getExtractionDate() { + return extractionDate; + } + + public void setExtractionDate(String extractionDate) { + this.extractionDate = extractionDate; + } + + public String getTransferDate() { + return transferDate; + } + + public void setTransferDate(String transferDate) { + this.transferDate = transferDate; + } + + public String getDonorBirthDate() { + return donorBirthDate; + } + + public void setDonorBirthDate(String donorBirthDate) { + this.donorBirthDate = donorBirthDate; + } + + public Integer getNasalBone() { + return nasalBone; + } + + public void setNasalBone(Integer nasalBone) { + this.nasalBone = nasalBone; + } + + public Integer getMonozygous() { + return monozygous; + } + + public void setMonozygous(Integer monozygous) { + this.monozygous = monozygous; + } + + public Integer getPatientType() { + return patientType; + } + + public void setPatientType(Integer patientType) { + this.patientType = patientType; + } public String getNf() { return nf; @@ -269,6 +455,14 @@ public class SieveApplyOrderAddRequest implements IBasicRequestConvert