jiangjiazhi / regional-platform

Download as
Browse Code »

Commit d5b0a6793753b54f18909fa947845ba28f8e6602

Authored by liquanyu
1 parent 2a0d7dfc85
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

肌萎缩

Showing 4 changed files with 287 additions and 279 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/HusbandSmn.java View file @ d5b0a67
  1 +package com.lyms.platform.pojo;
  2 +
  3 +import java.util.Date;
  4 +import java.util.Map;
  5 +
  6 +public class HusbandSmn {
  7 + public HusbandSmn() {
  8 + }
  9 +
  10 + private String parentId;//行记录id
  11 + private String husbandName;//丈夫姓名
  12 + private Integer husbandAge;//丈夫年龄
  13 + private String husbandCardNo;//丈夫身份证号码
  14 + private String husbandPhone;//丈夫手机
  15 + private String husbandNationId;//丈夫民族Id
  16 + private String ybType;//样本类型 外周血
  17 + private String ybNum;//样本号
  18 + private Date sendDate;//送检时间
  19 + private String sendDoctor;//送检医生
  20 + private String diagnose;//诊断
  21 + private Map<String,Object> familyHistory;//家族史
  22 + private String marriage;//父母是否近亲结婚 1 是 2 否
  23 + private String sendHospitalId;//送检医院
  24 +
  25 + private Integer status; //1 未申请 2 已申请 3 已接收 4 已筛查 5 不合格
  26 + private String hospitalId;//当前录入机构id
  27 + private Double smn7; //基因外显子7
  28 + private Double smn8;//基因外显子8
  29 + private String smn7Result; //基因外显子7 结果
  30 + private String smn8Result;//基因外显子8 结果
  31 + private Integer result; //1 阴性 2 阳性
  32 + private String suggest;//建议
  33 + private String checker;//检验员
  34 + private String reviewer;//审核人
  35 + private String approver;//批准人
  36 + private Date checkDate;//检查日期
  37 + private Date created;//创建记录时间
  38 +
  39 + private String orgProvinceId;
  40 + private String orgCityId;
  41 + private String orgAreaId;
  42 +
  43 + public String getParentId() {
  44 + return parentId;
  45 + }
  46 +
  47 + public void setParentId(String parentId) {
  48 + this.parentId = parentId;
  49 + }
  50 +
  51 + public String getHusbandName() {
  52 + return husbandName;
  53 + }
  54 +
  55 + public void setHusbandName(String husbandName) {
  56 + this.husbandName = husbandName;
  57 + }
  58 +
  59 + public Integer getHusbandAge() {
  60 + return husbandAge;
  61 + }
  62 +
  63 + public void setHusbandAge(Integer husbandAge) {
  64 + this.husbandAge = husbandAge;
  65 + }
  66 +
  67 + public String getHusbandCardNo() {
  68 + return husbandCardNo;
  69 + }
  70 +
  71 + public void setHusbandCardNo(String husbandCardNo) {
  72 + this.husbandCardNo = husbandCardNo;
  73 + }
  74 +
  75 + public String getHusbandPhone() {
  76 + return husbandPhone;
  77 + }
  78 +
  79 + public void setHusbandPhone(String husbandPhone) {
  80 + this.husbandPhone = husbandPhone;
  81 + }
  82 +
  83 + public String getHusbandNationId() {
  84 + return husbandNationId;
  85 + }
  86 +
  87 + public void setHusbandNationId(String husbandNationId) {
  88 + this.husbandNationId = husbandNationId;
  89 + }
  90 +
  91 + public String getYbType() {
  92 + return ybType;
  93 + }
  94 +
  95 + public void setYbType(String ybType) {
  96 + this.ybType = ybType;
  97 + }
  98 +
  99 + public String getYbNum() {
  100 + return ybNum;
  101 + }
  102 +
  103 + public void setYbNum(String ybNum) {
  104 + this.ybNum = ybNum;
  105 + }
  106 +
  107 + public Date getSendDate() {
  108 + return sendDate;
  109 + }
  110 +
  111 + public void setSendDate(Date sendDate) {
  112 + this.sendDate = sendDate;
  113 + }
  114 +
  115 + public String getSendDoctor() {
  116 + return sendDoctor;
  117 + }
  118 +
  119 + public void setSendDoctor(String sendDoctor) {
  120 + this.sendDoctor = sendDoctor;
  121 + }
  122 +
  123 + public String getDiagnose() {
  124 + return diagnose;
  125 + }
  126 +
  127 + public void setDiagnose(String diagnose) {
  128 + this.diagnose = diagnose;
  129 + }
  130 +
  131 + public Map<String, Object> getFamilyHistory() {
  132 + return familyHistory;
  133 + }
  134 +
  135 + public void setFamilyHistory(Map<String, Object> familyHistory) {
  136 + this.familyHistory = familyHistory;
  137 + }
  138 +
  139 + public String getMarriage() {
  140 + return marriage;
  141 + }
  142 +
  143 + public void setMarriage(String marriage) {
  144 + this.marriage = marriage;
  145 + }
  146 +
  147 + public Integer getStatus() {
  148 + return status;
  149 + }
  150 +
  151 + public void setStatus(Integer status) {
  152 + this.status = status;
  153 + }
  154 +
  155 + public String getHospitalId() {
  156 + return hospitalId;
  157 + }
  158 +
  159 + public void setHospitalId(String hospitalId) {
  160 + this.hospitalId = hospitalId;
  161 + }
  162 +
  163 + public String getSendHospitalId() {
  164 + return sendHospitalId;
  165 + }
  166 +
  167 + public void setSendHospitalId(String sendHospitalId) {
  168 + this.sendHospitalId = sendHospitalId;
  169 + }
  170 +
  171 + public Double getSmn7() {
  172 + return smn7;
  173 + }
  174 +
  175 + public void setSmn7(Double smn7) {
  176 + this.smn7 = smn7;
  177 + }
  178 +
  179 + public Double getSmn8() {
  180 + return smn8;
  181 + }
  182 +
  183 + public void setSmn8(Double smn8) {
  184 + this.smn8 = smn8;
  185 + }
  186 +
  187 + public String getSmn7Result() {
  188 + return smn7Result;
  189 + }
  190 +
  191 + public void setSmn7Result(String smn7Result) {
  192 + this.smn7Result = smn7Result;
  193 + }
  194 +
  195 + public String getSmn8Result() {
  196 + return smn8Result;
  197 + }
  198 +
  199 + public void setSmn8Result(String smn8Result) {
  200 + this.smn8Result = smn8Result;
  201 + }
  202 +
  203 + public Integer getResult() {
  204 + return result;
  205 + }
  206 +
  207 + public void setResult(Integer result) {
  208 + this.result = result;
  209 + }
  210 +
  211 + public String getSuggest() {
  212 + return suggest;
  213 + }
  214 +
  215 + public void setSuggest(String suggest) {
  216 + this.suggest = suggest;
  217 + }
  218 +
  219 + public String getChecker() {
  220 + return checker;
  221 + }
  222 +
  223 + public void setChecker(String checker) {
  224 + this.checker = checker;
  225 + }
  226 +
  227 + public String getReviewer() {
  228 + return reviewer;
  229 + }
  230 +
  231 + public void setReviewer(String reviewer) {
  232 + this.reviewer = reviewer;
  233 + }
  234 +
  235 + public String getApprover() {
  236 + return approver;
  237 + }
  238 +
  239 + public void setApprover(String approver) {
  240 + this.approver = approver;
  241 + }
  242 +
  243 + public Date getCheckDate() {
  244 + return checkDate;
  245 + }
  246 +
  247 + public void setCheckDate(Date checkDate) {
  248 + this.checkDate = checkDate;
  249 + }
  250 +
  251 + public Date getCreated() {
  252 + return created;
  253 + }
  254 +
  255 + public void setCreated(Date created) {
  256 + this.created = created;
  257 + }
  258 +
  259 + public String getOrgProvinceId() {
  260 + return orgProvinceId;
  261 + }
  262 +
  263 + public void setOrgProvinceId(String orgProvinceId) {
  264 + this.orgProvinceId = orgProvinceId;
  265 + }
  266 +
  267 + public String getOrgCityId() {
  268 + return orgCityId;
  269 + }
  270 +
  271 + public void setOrgCityId(String orgCityId) {
  272 + this.orgCityId = orgCityId;
  273 + }
  274 +
  275 + public String getOrgAreaId() {
  276 + return orgAreaId;
  277 + }
  278 +
  279 + public void setOrgAreaId(String orgAreaId) {
  280 + this.orgAreaId = orgAreaId;
  281 + }
  282 +}
platform-dal/src/main/java/com/lyms/platform/pojo/SmnModel.java View file @ d5b0a67
... ... @@ -448,281 +448,5 @@
448 448 public void setCheckDate(Date checkDate) {
449 449 this.checkDate = checkDate;
450 450 }
451   -
452   - public class HusbandSmn{
453   -
454   - private String parentId;//行记录id
455   - private String husbandName;//丈夫姓名
456   - private Integer husbandAge;//丈夫年龄
457   - private String husbandCardNo;//丈夫身份证号码
458   - private String husbandPhone;//丈夫手机
459   - private String husbandNationId;//丈夫民族Id
460   - private String ybType;//样本类型 外周血
461   - private String ybNum;//样本号
462   - private Date sendDate;//送检时间
463   - private String sendDoctor;//送检医生
464   - private String diagnose;//诊断
465   - private Map<String,Object> familyHistory;//家族史
466   - private String marriage;//父母是否近亲结婚 1 是 2 否
467   - private String sendHospitalId;//送检医院
468   -
469   - private Integer status; //1 未申请 2 已申请 3 已接收 4 已筛查 5 不合格
470   - private String hospitalId;//当前录入机构id
471   - private Double smn7; //基因外显子7
472   - private Double smn8;//基因外显子8
473   - private String smn7Result; //基因外显子7 结果
474   - private String smn8Result;//基因外显子8 结果
475   - private Integer result; //1 阴性 2 阳性
476   - private String suggest;//建议
477   - private String checker;//检验员
478   - private String reviewer;//审核人
479   - private String approver;//批准人
480   - private Date checkDate;//检查日期
481   - private Date created;//创建记录时间
482   -
483   - private String orgProvinceId;
484   - private String orgCityId;
485   - private String orgAreaId;
486   -
487   - public String getParentId() {
488   - return parentId;
489   - }
490   -
491   - public void setParentId(String parentId) {
492   - this.parentId = parentId;
493   - }
494   -
495   - public String getHusbandName() {
496   - return husbandName;
497   - }
498   -
499   - public void setHusbandName(String husbandName) {
500   - this.husbandName = husbandName;
501   - }
502   -
503   - public Integer getHusbandAge() {
504   - return husbandAge;
505   - }
506   -
507   - public void setHusbandAge(Integer husbandAge) {
508   - this.husbandAge = husbandAge;
509   - }
510   -
511   - public String getHusbandCardNo() {
512   - return husbandCardNo;
513   - }
514   -
515   - public void setHusbandCardNo(String husbandCardNo) {
516   - this.husbandCardNo = husbandCardNo;
517   - }
518   -
519   - public String getHusbandPhone() {
520   - return husbandPhone;
521   - }
522   -
523   - public void setHusbandPhone(String husbandPhone) {
524   - this.husbandPhone = husbandPhone;
525   - }
526   -
527   - public String getHusbandNationId() {
528   - return husbandNationId;
529   - }
530   -
531   - public void setHusbandNationId(String husbandNationId) {
532   - this.husbandNationId = husbandNationId;
533   - }
534   -
535   - public String getYbType() {
536   - return ybType;
537   - }
538   -
539   - public void setYbType(String ybType) {
540   - this.ybType = ybType;
541   - }
542   -
543   - public String getYbNum() {
544   - return ybNum;
545   - }
546   -
547   - public void setYbNum(String ybNum) {
548   - this.ybNum = ybNum;
549   - }
550   -
551   - public Date getSendDate() {
552   - return sendDate;
553   - }
554   -
555   - public void setSendDate(Date sendDate) {
556   - this.sendDate = sendDate;
557   - }
558   -
559   - public String getSendDoctor() {
560   - return sendDoctor;
561   - }
562   -
563   - public void setSendDoctor(String sendDoctor) {
564   - this.sendDoctor = sendDoctor;
565   - }
566   -
567   - public String getDiagnose() {
568   - return diagnose;
569   - }
570   -
571   - public void setDiagnose(String diagnose) {
572   - this.diagnose = diagnose;
573   - }
574   -
575   - public Map<String, Object> getFamilyHistory() {
576   - return familyHistory;
577   - }
578   -
579   - public void setFamilyHistory(Map<String, Object> familyHistory) {
580   - this.familyHistory = familyHistory;
581   - }
582   -
583   - public String getMarriage() {
584   - return marriage;
585   - }
586   -
587   - public void setMarriage(String marriage) {
588   - this.marriage = marriage;
589   - }
590   -
591   - public Integer getStatus() {
592   - return status;
593   - }
594   -
595   - public void setStatus(Integer status) {
596   - this.status = status;
597   - }
598   -
599   - public String getHospitalId() {
600   - return hospitalId;
601   - }
602   -
603   - public void setHospitalId(String hospitalId) {
604   - this.hospitalId = hospitalId;
605   - }
606   -
607   - public String getSendHospitalId() {
608   - return sendHospitalId;
609   - }
610   -
611   - public void setSendHospitalId(String sendHospitalId) {
612   - this.sendHospitalId = sendHospitalId;
613   - }
614   -
615   - public Double getSmn7() {
616   - return smn7;
617   - }
618   -
619   - public void setSmn7(Double smn7) {
620   - this.smn7 = smn7;
621   - }
622   -
623   - public Double getSmn8() {
624   - return smn8;
625   - }
626   -
627   - public void setSmn8(Double smn8) {
628   - this.smn8 = smn8;
629   - }
630   -
631   - public String getSmn7Result() {
632   - return smn7Result;
633   - }
634   -
635   - public void setSmn7Result(String smn7Result) {
636   - this.smn7Result = smn7Result;
637   - }
638   -
639   - public String getSmn8Result() {
640   - return smn8Result;
641   - }
642   -
643   - public void setSmn8Result(String smn8Result) {
644   - this.smn8Result = smn8Result;
645   - }
646   -
647   - public Integer getResult() {
648   - return result;
649   - }
650   -
651   - public void setResult(Integer result) {
652   - this.result = result;
653   - }
654   -
655   - public String getSuggest() {
656   - return suggest;
657   - }
658   -
659   - public void setSuggest(String suggest) {
660   - this.suggest = suggest;
661   - }
662   -
663   - public String getChecker() {
664   - return checker;
665   - }
666   -
667   - public void setChecker(String checker) {
668   - this.checker = checker;
669   - }
670   -
671   - public String getReviewer() {
672   - return reviewer;
673   - }
674   -
675   - public void setReviewer(String reviewer) {
676   - this.reviewer = reviewer;
677   - }
678   -
679   - public String getApprover() {
680   - return approver;
681   - }
682   -
683   - public void setApprover(String approver) {
684   - this.approver = approver;
685   - }
686   -
687   - public Date getCheckDate() {
688   - return checkDate;
689   - }
690   -
691   - public void setCheckDate(Date checkDate) {
692   - this.checkDate = checkDate;
693   - }
694   -
695   - public Date getCreated() {
696   - return created;
697   - }
698   -
699   - public void setCreated(Date created) {
700   - this.created = created;
701   - }
702   -
703   - public String getOrgProvinceId() {
704   - return orgProvinceId;
705   - }
706   -
707   - public void setOrgProvinceId(String orgProvinceId) {
708   - this.orgProvinceId = orgProvinceId;
709   - }
710   -
711   - public String getOrgCityId() {
712   - return orgCityId;
713   - }
714   -
715   - public void setOrgCityId(String orgCityId) {
716   - this.orgCityId = orgCityId;
717   - }
718   -
719   - public String getOrgAreaId() {
720   - return orgAreaId;
721   - }
722   -
723   - public void setOrgAreaId(String orgAreaId) {
724   - this.orgAreaId = orgAreaId;
725   - }
726   - }
727 451 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmnController.java View file @ d5b0a67
... ... @@ -8,6 +8,7 @@
8 8 import com.lyms.platform.operate.web.facade.SmnFacade;
9 9 import com.lyms.platform.operate.web.request.SmnQueryRequest;
10 10 import com.lyms.platform.operate.web.request.SmnRequest;
  11 +import com.lyms.platform.pojo.HusbandSmn;
11 12 import com.lyms.platform.pojo.SmnModel;
12 13 import org.springframework.beans.factory.annotation.Autowired;
13 14 import org.springframework.stereotype.Controller;
... ... @@ -37,7 +38,7 @@
37 38 @RequestMapping(method = RequestMethod.POST, value = "/addHusbandSmnApply")
38 39 @ResponseBody
39 40 @TokenRequired
40   - public BaseResponse addHusbandSmnApply(@RequestBody SmnModel.HusbandSmn param, HttpServletRequest request) {
  41 + public BaseResponse addHusbandSmnApply(@RequestBody HusbandSmn param, HttpServletRequest request) {
41 42 return smnFacade.addHusbandSmnApply(param, getUserId(request));
42 43 }
43 44  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java View file @ d5b0a67
... ... @@ -18,6 +18,7 @@
18 18 import com.lyms.platform.permission.model.Organization;
19 19 import com.lyms.platform.permission.service.OrganizationService;
20 20 import com.lyms.platform.permission.service.UsersService;
  21 +import com.lyms.platform.pojo.HusbandSmn;
21 22 import com.lyms.platform.pojo.Patients;
22 23 import com.lyms.platform.pojo.SmnModel;
23 24 import com.lyms.platform.query.PatientsQuery;
24 25  
... ... @@ -307,11 +308,11 @@
307 308 return new BaseObjectResponse().setData(data).setErrorcode(0).setErrormsg("成功");
308 309 }
309 310  
310   - public BaseResponse addHusbandSmnApply(SmnModel.HusbandSmn param, Integer userId) {
  311 + public BaseResponse addHusbandSmnApply(HusbandSmn param, Integer userId) {
311 312 String hospitalId = autoMatchFacade.getHospitalId(userId);
312 313 Query query = Query.query(Criteria.where("id").is(param.getParentId()));
313 314 SmnModel smnModel = mongoTemplate.findOne(query, SmnModel.class);
314   - List<SmnModel.HusbandSmn> husbandSmns = smnModel.getHusbandSmns();
  315 + List<HusbandSmn> husbandSmns = smnModel.getHusbandSmns();
315 316 Organization org = organizationService.getOrganization(Integer.parseInt(hospitalId));
316 317 param.setOrgProvinceId(org.getProvinceId());
317 318 param.setOrgCityId(org.getCityId());