jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 2e92298759430eec5cce0d3de62c7158f62fde31

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

妇女建档增加配偶信息

Showing 5 changed files with 200 additions and 3 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java View file @ 2e92298
... ... @@ -83,6 +83,22 @@
83 83  
84 84 /************院内信息*************/
85 85  
  86 +
  87 + /************配偶信息*************/
  88 +
  89 + //配偶姓名
  90 + private String spouseName;
  91 + //配偶证件号
  92 + private String spouseCardNo;
  93 + //配偶手机
  94 + private String spousePhone;
  95 +
  96 + //配偶证件类型Id
  97 + private String spouseCertTypeId;
  98 +
  99 +
  100 + /************配偶信息*************/
  101 +
86 102 //就诊卡号
87 103 private String vcCardNo;
88 104 //建档人
... ... @@ -104,6 +120,38 @@
104 120 private String publishId;
105 121  
106 122 private String publishName;
  123 +
  124 + public String getSpouseName() {
  125 + return spouseName;
  126 + }
  127 +
  128 + public void setSpouseName(String spouseName) {
  129 + this.spouseName = spouseName;
  130 + }
  131 +
  132 + public String getSpouseCardNo() {
  133 + return spouseCardNo;
  134 + }
  135 +
  136 + public void setSpouseCardNo(String spouseCardNo) {
  137 + this.spouseCardNo = spouseCardNo;
  138 + }
  139 +
  140 + public String getSpousePhone() {
  141 + return spousePhone;
  142 + }
  143 +
  144 + public void setSpousePhone(String spousePhone) {
  145 + this.spousePhone = spousePhone;
  146 + }
  147 +
  148 + public String getSpouseCertTypeId() {
  149 + return spouseCertTypeId;
  150 + }
  151 +
  152 + public void setSpouseCertTypeId(String spouseCertTypeId) {
  153 + this.spouseCertTypeId = spouseCertTypeId;
  154 + }
107 155  
108 156 public Integer getAge() {
109 157 return age;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentsArchiveController.java View file @ 2e92298
... ... @@ -76,7 +76,7 @@
76 76 queryRequest.setVcCardNo(vcCardNo);
77 77 //获取当前登录用户ID
78 78 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
79   - return residentsArchiveFacade.findResidentsArchive(queryRequest,loginState.getId());
  79 + return residentsArchiveFacade.findResidentsArchive(queryRequest, loginState.getId());
80 80 }
81 81  
82 82  
... ... @@ -98,6 +98,22 @@
98 98 BaseObjectResponse p = residentsArchiveFacade.addResidentsArchiveBy(addRequest, loginState.getId());
99 99 return p;
100 100 }
  101 +
  102 + /**
  103 + * 查询配偶信息
  104 + * @param name
  105 + * @param request
  106 + * @return
  107 + */
  108 + @RequestMapping(value = "/querySpouseInfoByName", method = RequestMethod.GET)
  109 + @ResponseBody
  110 + @TokenRequired
  111 + public BaseObjectResponse querySpouseInfoByName(@RequestParam("name")String name,@RequestParam("sexId")String sexId,HttpServletRequest request){
  112 + LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
  113 + BaseObjectResponse objectResponse = residentsArchiveFacade.querySpouseInfoByName(name,sexId, loginState.getId());
  114 + return objectResponse;
  115 + }
  116 +
101 117  
102 118 /**
103 119 * 通过ID查询居民健康档案详情
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java View file @ 2e92298
... ... @@ -504,8 +504,8 @@
504 504 }
505 505 }
506 506 Map<String,Object> map = new HashMap<>();
507   - map.put("ResidentsArchiveResult",result);
508   - map.put("historyResult",historyResults);
  507 + map.put("ResidentsArchiveResult", result);
  508 + map.put("historyResult", historyResults);
509 509 objectResponse.setData(map);
510 510 objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
511 511 objectResponse.setErrormsg("成功");
... ... @@ -533,6 +533,12 @@
533 533 result.setProfessionTypeId(model.getProfessionTypeId());
534 534 result.setHospitalId(model.getHospitalId());
535 535  
  536 +
  537 + result.setSpouseName(model.getSpouseName());
  538 + result.setSpouseCardNo(model.getSpouseCardNo());
  539 + result.setSpousePhone(model.getSpousePhone());
  540 + result.setSpouseCertTypeId(model.getSpouseCertTypeId());
  541 +
536 542 result.setPhone(model.getPhone());
537 543 result.setWorkUnit(model.getWorkUnit());
538 544 result.setProvinceId(model.getProvinceId());
... ... @@ -901,5 +907,30 @@
901 907 }
902 908  
903 909  
  910 + public BaseObjectResponse querySpouseInfoByName(String name,String sexId, Integer userId) {
  911 + ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery();
  912 + archiveQuery.setYn(YnEnums.YES.getId());
  913 + String hospital = autoMatchFacade.getHospitalId(userId);
  914 + archiveQuery.setSex(sexId);
  915 + archiveQuery.setHospitalId(hospital);
  916 + archiveQuery.setQueryNo(name);
  917 + List<ResidentsArchiveModel> archiveModelList = residentsArchiveService.queryResident(archiveQuery);
  918 +
  919 + List<Map> list = new ArrayList<>();
  920 +
  921 + if (CollectionUtils.isNotEmpty(archiveModelList))
  922 + {
  923 + for (ResidentsArchiveModel model : archiveModelList)
  924 + {
  925 + Map map = new HashMap();
  926 + map.put("name",model.getUsername());
  927 + map.put("phone",model.getPhone());
  928 + map.put("certTypeId",model.getCensusTypeId());
  929 + map.put("cardNo", com.lyms.platform.common.utils.StringUtils.encryCardNo(model.getCertificateNum()));
  930 + list.add(map);
  931 + }
  932 + }
  933 + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(list);
  934 + }
904 935 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java View file @ 2e92298
... ... @@ -56,6 +56,22 @@
56 56  
57 57 /************联系方式*************/
58 58  
  59 +
  60 + /************配偶信息*************/
  61 +
  62 + //配偶姓名
  63 + private String spouseName;
  64 + //配偶证件号
  65 + private String spouseCardNo;
  66 + //配偶手机
  67 + private String spousePhone;
  68 +
  69 + //配偶证件类型Id
  70 + private String spouseCertTypeId;
  71 +
  72 +
  73 + /************配偶信息*************/
  74 +
59 75 //手机号
60 76 private String phone;
61 77 //工作单位
... ... @@ -94,6 +110,8 @@
94 110 //建档日期
95 111 private String buildDay;
96 112  
  113 +
  114 +
97 115 @Override
98 116 public ResidentsArchiveModel convertToDataModel() {
99 117 ResidentsArchiveModel model = new ResidentsArchiveModel();
... ... @@ -113,6 +131,11 @@
113 131 model.setHospitalId(hospitalId);
114 132 model.setAge(age);
115 133  
  134 + model.setSpouseName(spouseName);
  135 + model.setSpouseCardNo(spouseCardNo);
  136 + model.setSpouseCertTypeId(spouseCertTypeId);
  137 + model.setSpousePhone(spousePhone);
  138 +
116 139 model.setPhone(phone);
117 140 model.setWorkUnit(workUnit);
118 141 model.setProvinceId(provinceId);
... ... @@ -145,6 +168,38 @@
145 168 model.setBuildDoctor(buildDoctor);
146 169 model.setBuildDay((buildDay!=null && buildDay!="") ? DateUtil.parseYMD(buildDay) : null);
147 170 return model;
  171 + }
  172 +
  173 + public String getSpouseName() {
  174 + return spouseName;
  175 + }
  176 +
  177 + public void setSpouseName(String spouseName) {
  178 + this.spouseName = spouseName;
  179 + }
  180 +
  181 + public String getSpouseCertTypeId() {
  182 + return spouseCertTypeId;
  183 + }
  184 +
  185 + public void setSpouseCertTypeId(String spouseCertTypeId) {
  186 + this.spouseCertTypeId = spouseCertTypeId;
  187 + }
  188 +
  189 + public String getSpousePhone() {
  190 + return spousePhone;
  191 + }
  192 +
  193 + public void setSpousePhone(String spousePhone) {
  194 + this.spousePhone = spousePhone;
  195 + }
  196 +
  197 + public String getSpouseCardNo() {
  198 + return spouseCardNo;
  199 + }
  200 +
  201 + public void setSpouseCardNo(String spouseCardNo) {
  202 + this.spouseCardNo = spouseCardNo;
148 203 }
149 204  
150 205 public Integer getAge() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsArchiveResult.java View file @ 2e92298
... ... @@ -60,6 +60,21 @@
60 60 private String streetRegisterId;
61 61 private String addressRegister;
62 62  
  63 + /************配偶信息*************/
  64 +
  65 + //配偶姓名
  66 + private String spouseName;
  67 + //配偶证件号
  68 + private String spouseCardNo;
  69 + //配偶手机
  70 + private String spousePhone;
  71 +
  72 + //配偶证件类型Id
  73 + private String spouseCertTypeId;
  74 +
  75 +
  76 + /************配偶信息*************/
  77 +
63 78 /************病史信息*************/
64 79  
65 80 //既往史
... ... @@ -90,6 +105,38 @@
90 105 private Date created;
91 106 //修改时间
92 107 private Date modified;
  108 +
  109 + public String getSpouseName() {
  110 + return spouseName;
  111 + }
  112 +
  113 + public void setSpouseName(String spouseName) {
  114 + this.spouseName = spouseName;
  115 + }
  116 +
  117 + public String getSpouseCardNo() {
  118 + return spouseCardNo;
  119 + }
  120 +
  121 + public void setSpouseCardNo(String spouseCardNo) {
  122 + this.spouseCardNo = spouseCardNo;
  123 + }
  124 +
  125 + public String getSpousePhone() {
  126 + return spousePhone;
  127 + }
  128 +
  129 + public void setSpousePhone(String spousePhone) {
  130 + this.spousePhone = spousePhone;
  131 + }
  132 +
  133 + public String getSpouseCertTypeId() {
  134 + return spouseCertTypeId;
  135 + }
  136 +
  137 + public void setSpouseCertTypeId(String spouseCertTypeId) {
  138 + this.spouseCertTypeId = spouseCertTypeId;
  139 + }
93 140  
94 141 public Integer getAge() {
95 142 return age;