From d5b0a6793753b54f18909fa947845ba28f8e6602 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 28 Sep 2022 15:01:32 +0800 Subject: [PATCH] =?UTF-8?q?=E8=82=8C=E8=90=8E=E7=BC=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/pojo/HusbandSmn.java | 282 +++++++++++++++++++++ .../main/java/com/lyms/platform/pojo/SmnModel.java | 276 -------------------- .../operate/web/controller/SmnController.java | 3 +- .../platform/operate/web/facade/SmnFacade.java | 5 +- 4 files changed, 287 insertions(+), 279 deletions(-) create mode 100644 platform-dal/src/main/java/com/lyms/platform/pojo/HusbandSmn.java diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/HusbandSmn.java b/platform-dal/src/main/java/com/lyms/platform/pojo/HusbandSmn.java new file mode 100644 index 0000000..477830c --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/HusbandSmn.java @@ -0,0 +1,282 @@ +package com.lyms.platform.pojo; + +import java.util.Date; +import java.util.Map; + +public class HusbandSmn { + public HusbandSmn() { + } + + private String parentId;//行记录id + private String husbandName;//丈夫姓名 + private Integer husbandAge;//丈夫年龄 + private String husbandCardNo;//丈夫身份证号码 + private String husbandPhone;//丈夫手机 + private String husbandNationId;//丈夫民族Id + private String ybType;//样本类型 外周血 + private String ybNum;//样本号 + private Date sendDate;//送检时间 + private String sendDoctor;//送检医生 + private String diagnose;//诊断 + private Map familyHistory;//家族史 + private String marriage;//父母是否近亲结婚 1 是 2 否 + private String sendHospitalId;//送检医院 + + private Integer status; //1 未申请 2 已申请 3 已接收 4 已筛查 5 不合格 + private String hospitalId;//当前录入机构id + private Double smn7; //基因外显子7 + private Double smn8;//基因外显子8 + private String smn7Result; //基因外显子7 结果 + private String smn8Result;//基因外显子8 结果 + private Integer result; //1 阴性 2 阳性 + private String suggest;//建议 + private String checker;//检验员 + private String reviewer;//审核人 + private String approver;//批准人 + private Date checkDate;//检查日期 + private Date created;//创建记录时间 + + private String orgProvinceId; + private String orgCityId; + private String orgAreaId; + + public String getParentId() { + return parentId; + } + + public void setParentId(String parentId) { + this.parentId = parentId; + } + + public String getHusbandName() { + return husbandName; + } + + public void setHusbandName(String husbandName) { + this.husbandName = husbandName; + } + + public Integer getHusbandAge() { + return husbandAge; + } + + public void setHusbandAge(Integer husbandAge) { + this.husbandAge = husbandAge; + } + + public String getHusbandCardNo() { + return husbandCardNo; + } + + public void setHusbandCardNo(String husbandCardNo) { + this.husbandCardNo = husbandCardNo; + } + + public String getHusbandPhone() { + return husbandPhone; + } + + public void setHusbandPhone(String husbandPhone) { + this.husbandPhone = husbandPhone; + } + + public String getHusbandNationId() { + return husbandNationId; + } + + public void setHusbandNationId(String husbandNationId) { + this.husbandNationId = husbandNationId; + } + + public String getYbType() { + return ybType; + } + + public void setYbType(String ybType) { + this.ybType = ybType; + } + + public String getYbNum() { + return ybNum; + } + + public void setYbNum(String ybNum) { + this.ybNum = ybNum; + } + + public Date getSendDate() { + return sendDate; + } + + public void setSendDate(Date sendDate) { + this.sendDate = sendDate; + } + + public String getSendDoctor() { + return sendDoctor; + } + + public void setSendDoctor(String sendDoctor) { + this.sendDoctor = sendDoctor; + } + + public String getDiagnose() { + return diagnose; + } + + public void setDiagnose(String diagnose) { + this.diagnose = diagnose; + } + + public Map getFamilyHistory() { + return familyHistory; + } + + public void setFamilyHistory(Map familyHistory) { + this.familyHistory = familyHistory; + } + + public String getMarriage() { + return marriage; + } + + public void setMarriage(String marriage) { + this.marriage = marriage; + } + + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + + public String getSendHospitalId() { + return sendHospitalId; + } + + public void setSendHospitalId(String sendHospitalId) { + this.sendHospitalId = sendHospitalId; + } + + public Double getSmn7() { + return smn7; + } + + public void setSmn7(Double smn7) { + this.smn7 = smn7; + } + + public Double getSmn8() { + return smn8; + } + + public void setSmn8(Double smn8) { + this.smn8 = smn8; + } + + public String getSmn7Result() { + return smn7Result; + } + + public void setSmn7Result(String smn7Result) { + this.smn7Result = smn7Result; + } + + public String getSmn8Result() { + return smn8Result; + } + + public void setSmn8Result(String smn8Result) { + this.smn8Result = smn8Result; + } + + public Integer getResult() { + return result; + } + + public void setResult(Integer result) { + this.result = result; + } + + public String getSuggest() { + return suggest; + } + + public void setSuggest(String suggest) { + this.suggest = suggest; + } + + public String getChecker() { + return checker; + } + + public void setChecker(String checker) { + this.checker = checker; + } + + public String getReviewer() { + return reviewer; + } + + public void setReviewer(String reviewer) { + this.reviewer = reviewer; + } + + public String getApprover() { + return approver; + } + + public void setApprover(String approver) { + this.approver = approver; + } + + public Date getCheckDate() { + return checkDate; + } + + public void setCheckDate(Date checkDate) { + this.checkDate = checkDate; + } + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + } + + public String getOrgProvinceId() { + return orgProvinceId; + } + + public void setOrgProvinceId(String orgProvinceId) { + this.orgProvinceId = orgProvinceId; + } + + public String getOrgCityId() { + return orgCityId; + } + + public void setOrgCityId(String orgCityId) { + this.orgCityId = orgCityId; + } + + public String getOrgAreaId() { + return orgAreaId; + } + + public void setOrgAreaId(String orgAreaId) { + this.orgAreaId = orgAreaId; + } +} diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SmnModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SmnModel.java index 2ce0a07..705d59a 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/SmnModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SmnModel.java @@ -448,280 +448,4 @@ public class SmnModel { public void setCheckDate(Date checkDate) { this.checkDate = checkDate; } - - public class HusbandSmn{ - - private String parentId;//行记录id - private String husbandName;//丈夫姓名 - private Integer husbandAge;//丈夫年龄 - private String husbandCardNo;//丈夫身份证号码 - private String husbandPhone;//丈夫手机 - private String husbandNationId;//丈夫民族Id - private String ybType;//样本类型 外周血 - private String ybNum;//样本号 - private Date sendDate;//送检时间 - private String sendDoctor;//送检医生 - private String diagnose;//诊断 - private Map familyHistory;//家族史 - private String marriage;//父母是否近亲结婚 1 是 2 否 - private String sendHospitalId;//送检医院 - - private Integer status; //1 未申请 2 已申请 3 已接收 4 已筛查 5 不合格 - private String hospitalId;//当前录入机构id - private Double smn7; //基因外显子7 - private Double smn8;//基因外显子8 - private String smn7Result; //基因外显子7 结果 - private String smn8Result;//基因外显子8 结果 - private Integer result; //1 阴性 2 阳性 - private String suggest;//建议 - private String checker;//检验员 - private String reviewer;//审核人 - private String approver;//批准人 - private Date checkDate;//检查日期 - private Date created;//创建记录时间 - - private String orgProvinceId; - private String orgCityId; - private String orgAreaId; - - public String getParentId() { - return parentId; - } - - public void setParentId(String parentId) { - this.parentId = parentId; - } - - public String getHusbandName() { - return husbandName; - } - - public void setHusbandName(String husbandName) { - this.husbandName = husbandName; - } - - public Integer getHusbandAge() { - return husbandAge; - } - - public void setHusbandAge(Integer husbandAge) { - this.husbandAge = husbandAge; - } - - public String getHusbandCardNo() { - return husbandCardNo; - } - - public void setHusbandCardNo(String husbandCardNo) { - this.husbandCardNo = husbandCardNo; - } - - public String getHusbandPhone() { - return husbandPhone; - } - - public void setHusbandPhone(String husbandPhone) { - this.husbandPhone = husbandPhone; - } - - public String getHusbandNationId() { - return husbandNationId; - } - - public void setHusbandNationId(String husbandNationId) { - this.husbandNationId = husbandNationId; - } - - public String getYbType() { - return ybType; - } - - public void setYbType(String ybType) { - this.ybType = ybType; - } - - public String getYbNum() { - return ybNum; - } - - public void setYbNum(String ybNum) { - this.ybNum = ybNum; - } - - public Date getSendDate() { - return sendDate; - } - - public void setSendDate(Date sendDate) { - this.sendDate = sendDate; - } - - public String getSendDoctor() { - return sendDoctor; - } - - public void setSendDoctor(String sendDoctor) { - this.sendDoctor = sendDoctor; - } - - public String getDiagnose() { - return diagnose; - } - - public void setDiagnose(String diagnose) { - this.diagnose = diagnose; - } - - public Map getFamilyHistory() { - return familyHistory; - } - - public void setFamilyHistory(Map familyHistory) { - this.familyHistory = familyHistory; - } - - public String getMarriage() { - return marriage; - } - - public void setMarriage(String marriage) { - this.marriage = marriage; - } - - public Integer getStatus() { - return status; - } - - public void setStatus(Integer status) { - this.status = status; - } - - public String getHospitalId() { - return hospitalId; - } - - public void setHospitalId(String hospitalId) { - this.hospitalId = hospitalId; - } - - public String getSendHospitalId() { - return sendHospitalId; - } - - public void setSendHospitalId(String sendHospitalId) { - this.sendHospitalId = sendHospitalId; - } - - public Double getSmn7() { - return smn7; - } - - public void setSmn7(Double smn7) { - this.smn7 = smn7; - } - - public Double getSmn8() { - return smn8; - } - - public void setSmn8(Double smn8) { - this.smn8 = smn8; - } - - public String getSmn7Result() { - return smn7Result; - } - - public void setSmn7Result(String smn7Result) { - this.smn7Result = smn7Result; - } - - public String getSmn8Result() { - return smn8Result; - } - - public void setSmn8Result(String smn8Result) { - this.smn8Result = smn8Result; - } - - public Integer getResult() { - return result; - } - - public void setResult(Integer result) { - this.result = result; - } - - public String getSuggest() { - return suggest; - } - - public void setSuggest(String suggest) { - this.suggest = suggest; - } - - public String getChecker() { - return checker; - } - - public void setChecker(String checker) { - this.checker = checker; - } - - public String getReviewer() { - return reviewer; - } - - public void setReviewer(String reviewer) { - this.reviewer = reviewer; - } - - public String getApprover() { - return approver; - } - - public void setApprover(String approver) { - this.approver = approver; - } - - public Date getCheckDate() { - return checkDate; - } - - public void setCheckDate(Date checkDate) { - this.checkDate = checkDate; - } - - public Date getCreated() { - return created; - } - - public void setCreated(Date created) { - this.created = created; - } - - public String getOrgProvinceId() { - return orgProvinceId; - } - - public void setOrgProvinceId(String orgProvinceId) { - this.orgProvinceId = orgProvinceId; - } - - public String getOrgCityId() { - return orgCityId; - } - - public void setOrgCityId(String orgCityId) { - this.orgCityId = orgCityId; - } - - public String getOrgAreaId() { - return orgAreaId; - } - - public void setOrgAreaId(String orgAreaId) { - this.orgAreaId = orgAreaId; - } - } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmnController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmnController.java index 9a9d3f6..35c970e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmnController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmnController.java @@ -8,6 +8,7 @@ import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.operate.web.facade.SmnFacade; import com.lyms.platform.operate.web.request.SmnQueryRequest; import com.lyms.platform.operate.web.request.SmnRequest; +import com.lyms.platform.pojo.HusbandSmn; import com.lyms.platform.pojo.SmnModel; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -37,7 +38,7 @@ public class SmnController extends BaseController { @RequestMapping(method = RequestMethod.POST, value = "/addHusbandSmnApply") @ResponseBody @TokenRequired - public BaseResponse addHusbandSmnApply(@RequestBody SmnModel.HusbandSmn param, HttpServletRequest request) { + public BaseResponse addHusbandSmnApply(@RequestBody HusbandSmn param, HttpServletRequest request) { return smnFacade.addHusbandSmnApply(param, getUserId(request)); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java index 0fe16b2..f73b011 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java @@ -18,6 +18,7 @@ import com.lyms.platform.operate.web.utils.CommonsHelper; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; +import com.lyms.platform.pojo.HusbandSmn; import com.lyms.platform.pojo.Patients; import com.lyms.platform.pojo.SmnModel; import com.lyms.platform.query.PatientsQuery; @@ -307,11 +308,11 @@ public class SmnFacade { return new BaseObjectResponse().setData(data).setErrorcode(0).setErrormsg("成功"); } - public BaseResponse addHusbandSmnApply(SmnModel.HusbandSmn param, Integer userId) { + public BaseResponse addHusbandSmnApply(HusbandSmn param, Integer userId) { String hospitalId = autoMatchFacade.getHospitalId(userId); Query query = Query.query(Criteria.where("id").is(param.getParentId())); SmnModel smnModel = mongoTemplate.findOne(query, SmnModel.class); - List husbandSmns = smnModel.getHusbandSmns(); + List husbandSmns = smnModel.getHusbandSmns(); Organization org = organizationService.getOrganization(Integer.parseInt(hospitalId)); param.setOrgProvinceId(org.getProvinceId()); param.setOrgCityId(org.getCityId()); -- 1.8.3.1