jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 035355f3f53e3bc00ea76e5661b4be3db4ca8509

Authored by wtt
2 parents 6eb2323fb8 090200d1bf
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 9 changed files

platform-operate-api/src/main/java/com/lyms/hospitalapi/lcfy/LisService.java View file @ 035355f
1 1 package com.lyms.hospitalapi.lcfy;
2 2  
3 3 import com.lyms.platform.common.utils.DateUtil;
  4 +import com.lyms.platform.common.utils.PingYinUtil;
4 5 import com.lyms.platform.common.utils.SystemConfig;
5 6 import com.lyms.platform.pojo.PreEugenicsBaseModel;
6 7 import com.lyms.platform.pojo.ResidentsArchiveModel;
... ... @@ -58,7 +59,7 @@
58 59 itemsMan.put("lyms013","梅毒螺旋体筛查");
59 60 Connection conn = null;
60 61 String sql = "insert into TI_申请信息(v患者类别,v患者编号,v患者ID号,v患者姓名,v性别,v年龄,v年龄类型,v申请项目编码,v申请项目名称," +
61   - "v唯一标识号,iTag,v手机号,v身份证号,d申请时间,v申请日期,i项目数量) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
  62 + "v唯一标识号,iTag,v手机号,v身份证号,d申请时间,v申请日期,i项目数量,v拼音码) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
62 63 PreparedStatement ps = null;
63 64 ResultSet rs = null;
64 65 try {
65 66  
... ... @@ -82,8 +83,9 @@
82 83 ps.setString(12,model.getWifePhone());
83 84 ps.setString(13,model.getWifeCardNo());
84 85 ps.setDate(14, new java.sql.Date(new Date().getTime()));
85   - ps.setString(15,DateUtil.getyyyy_MM_dd(new Date()));
  86 + ps.setString(15, DateUtil.getyyyy_MM_dd(new Date()));
86 87 ps.setInt(16, 1);
  88 + ps.setString(17, PingYinUtil.getFirstSpell(model.getWifeName()).toUpperCase());
87 89 int inCount = ps.executeUpdate();
88 90 System.out.println("女性保存"+inCount);
89 91 }
... ... @@ -107,6 +109,7 @@
107 109 ps.setDate(14, new java.sql.Date(new Date().getTime()));
108 110 ps.setString(15, DateUtil.getyyyy_MM_dd(new Date()));
109 111 ps.setInt(16, 1);
  112 + ps.setString(17, PingYinUtil.getFirstSpell(model.getHusbandName()).toUpperCase());
110 113 int inCount = ps.executeUpdate();
111 114 System.out.println("男性性保存"+inCount);
112 115 }
... ... @@ -177,7 +180,7 @@
177 180 itemsMan.put("lymsh013","梅毒螺旋体筛查");
178 181 Connection conn = null;
179 182 String sql = "insert into TI_申请信息(v患者类别,v患者编号,v患者ID号,v患者姓名,v性别,v年龄,v年龄类型,v申请项目编码,v申请项目名称," +
180   - "v唯一标识号,iTag,v手机号,v身份证号,d申请时间,v申请日期,i项目数量) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
  183 + "v唯一标识号,iTag,v手机号,v身份证号,d申请时间,v申请日期,i项目数量,v拼音码) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
181 184 PreparedStatement ps = null;
182 185 ResultSet rs = null;
183 186 try {
184 187  
... ... @@ -211,8 +214,9 @@
211 214 ps.setString(12,residentsArchiveModel.getPhone());
212 215 ps.setString(13,residentsArchiveModel.getCertificateNum());
213 216 ps.setDate(14, new java.sql.Date(new Date().getTime()));
214   - ps.setString(15,DateUtil.getyyyy_MM_dd(new Date()));
  217 + ps.setString(15, DateUtil.getyyyy_MM_dd(new Date()));
215 218 ps.setInt(16, 1);
  219 + ps.setString(17, PingYinUtil.getFirstSpell(residentsArchiveModel.getUsername()).toUpperCase());
216 220 int inCount = ps.executeUpdate();
217 221 System.out.println("女性保存"+inCount);
218 222 }
... ... @@ -239,6 +243,7 @@
239 243 ps.setDate(14, new java.sql.Date(new Date().getTime()));
240 244 ps.setString(15, DateUtil.getyyyy_MM_dd(new Date()));
241 245 ps.setInt(16, 1);
  246 + ps.setString(17, PingYinUtil.getFirstSpell(residentsArchiveModel.getUsername()).toUpperCase());
242 247 int inCount = ps.executeUpdate();
243 248 System.out.println("男性性保存"+inCount);
244 249 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DefectiveChildController.java View file @ 035355f
... ... @@ -4,10 +4,7 @@
4 4  
5 5 import org.springframework.beans.factory.annotation.Autowired;
6 6 import org.springframework.stereotype.Controller;
7   -import org.springframework.web.bind.annotation.RequestBody;
8   -import org.springframework.web.bind.annotation.RequestMapping;
9   -import org.springframework.web.bind.annotation.RequestMethod;
10   -import org.springframework.web.bind.annotation.ResponseBody;
  7 +import org.springframework.web.bind.annotation.*;
11 8  
12 9 import com.fasterxml.jackson.annotation.JsonAlias;
13 10 import com.lyms.platform.common.annotation.TokenRequired;
... ... @@ -57,7 +54,7 @@
57 54 @TokenRequired
58 55 public BaseResponse add(@RequestBody DefectiveChildRequest param, HttpServletRequest request) {
59 56 param.setCreateUser(getUserId(request).toString());
60   - return defectiveChildService.add(param,getUserId(request));
  57 + return defectiveChildService.add(param, getUserId(request));
61 58 }
62 59  
63 60 /**
... ... @@ -83,7 +80,7 @@
83 80 @ResponseBody
84 81 @TokenRequired
85 82 public BaseListResponse listPage(@JsonAlias DefectiveChildListRequest param,HttpServletRequest request) {
86   - return defectiveChildService.listPage(param,getUserId(request));
  83 + return defectiveChildService.listPage(param, getUserId(request));
87 84 }
88 85  
89 86 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PreEugenicsBaseController.java View file @ 035355f
... ... @@ -147,5 +147,20 @@
147 147 public BaseResponse delete(@PathVariable String id) {
148 148 return iPreEugenicsService.delete(id);
149 149 }
  150 +
  151 +
  152 +
  153 +
  154 + /**
  155 + * 保存lis检查项到lis系统中
  156 + * @param id
  157 + * @return
  158 + */
  159 + @RequestMapping(value = "/setDefectiveChildCheckItem/{id}", method = RequestMethod.GET)
  160 + @ResponseBody
  161 + @TokenRequired
  162 + public BaseResponse setDefectiveChildCheckItem(@PathVariable("id")String id){
  163 + return iPreEugenicsService.setPreEugenicsCheckItem(id);
  164 + }
150 165 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ 035355f
... ... @@ -192,11 +192,11 @@
192 192  
193 193 String spouseCode = "";
194 194 //当婚检ID为空,用证件号或者就诊卡去查询居民建档的信息
195   - if (StringUtils.isNotEmpty(archiveModel.getSpouseCardNo())) {
  195 + if (StringUtils.isNotEmpty(archiveModel.getSpouseCardNo()) || (result != null && StringUtils.isNotEmpty(result.getSpouseCertificateNum()))) {
196 196 ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery();
197 197 archiveQuery.setYn(YnEnums.YES.getId());
198 198 archiveQuery.setHospitalId(requestParam.getHospitalId());
199   - archiveQuery.setCertificateNum(archiveModel.getSpouseCardNo());
  199 + archiveQuery.setCertificateNum(StringUtils.isNotEmpty(archiveModel.getSpouseCardNo()) ? archiveModel.getSpouseCardNo() : result.getSpouseCertificateNum());
200 200 List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(archiveQuery);
201 201 if (CollectionUtils.isNotEmpty(modelList))
202 202 {
203 203  
... ... @@ -206,9 +206,11 @@
206 206 checkupResult.setSpouseName(model.getUsername());
207 207 checkupResult.setSpouseCertificateTypeId(model.getCertificateTypeId());
208 208 checkupResult.setSpouseCertificateNum(model.getCertificateNum());
  209 +
209 210 }
210 211 }
211 212 archiveMap.put("spouseCode", spouseCode);
  213 +
212 214 }
213 215  
214 216 resultMap.put("archiveResult", archiveMap);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java View file @ 035355f
... ... @@ -408,6 +408,7 @@
408 408  
409 409 private synchronized void setCode(ResidentsArchiveModel archiveModel)
410 410 {
  411 + String cuurent = DateUtil.getYyyyMM(new Date());
411 412 ResidentsArchiveQuery query = new ResidentsArchiveQuery();
412 413 query.setYn(YnEnums.YES.getId());
413 414 query.setHospitalId(archiveModel.getHospitalId());
414 415  
415 416  
... ... @@ -418,15 +419,13 @@
418 419 List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResidentWithSort(query,"code",Sort.Direction.DESC);
419 420 if (CollectionUtils.isNotEmpty(modelList)) {
420 421 ResidentsArchiveModel model = modelList.get(0);
421   - if (model.getCode() != null)
  422 + if (model.getCode() != null && String.valueOf(model.getCode()).contains(cuurent))
422 423 {
423 424 archiveModel.setCode(model.getCode()+1);
  425 + return;
424 426 }
425 427 }
426   - else
427   - {
428   - archiveModel.setCode(Long.valueOf(DateUtil.getYyyyMM(new Date())+"001"));
429   - }
  428 + archiveModel.setCode(Long.valueOf(cuurent+"001"));
430 429 }
431 430  
432 431 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/DefectiveChildService.java View file @ 035355f
... ... @@ -4,6 +4,5 @@
4 4 import com.lyms.platform.operate.web.request.DefectiveChildRequest;
5 5  
6 6 public interface DefectiveChildService extends IFormReportService<DefectiveChildRequest, DefectiveChildListRequest> {
7   -
8 7 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPreEugenicsService.java View file @ 035355f
... ... @@ -11,5 +11,7 @@
11 11 * @return
12 12 */
13 13 BaseResponse delete(String id);
  14 +
  15 + BaseResponse setPreEugenicsCheckItem(String id);
14 16 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/DefectiveChildServiceImpl.java View file @ 035355f
... ... @@ -4,7 +4,11 @@
4 4 import java.util.LinkedList;
5 5 import java.util.List;
6 6  
  7 +import com.lyms.hospitalapi.lcfy.LisService;
  8 +import com.lyms.platform.common.enums.YnEnums;
7 9 import com.lyms.platform.operate.web.facade.AutoMatchFacade;
  10 +import com.lyms.platform.pojo.ResidentsArchiveModel;
  11 +import com.lyms.platform.query.ResidentsArchiveQuery;
8 12 import org.apache.commons.collections.CollectionUtils;
9 13 import org.springframework.beans.BeanUtils;
10 14 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -58,6 +62,10 @@
58 62  
59 63 @Autowired
60 64 private AutoMatchFacade autoMatchFacade;
  65 +
  66 +
  67 + @Autowired
  68 + private LisService lcfyLisService;
61 69  
62 70  
63 71 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java View file @ 035355f
... ... @@ -3,10 +3,13 @@
3 3 import java.util.*;
4 4  
5 5 import com.lyms.hospitalapi.lcfy.LisService;
  6 +import com.lyms.platform.common.enums.YnEnums;
6 7 import com.lyms.platform.operate.web.facade.AutoMatchFacade;
7 8 import com.lyms.platform.operate.web.request.YqysParamRequest;
8 9 import com.lyms.platform.permission.service.UsersService;
9 10 import com.lyms.platform.pojo.BasicConfig;
  11 +import com.lyms.platform.query.ResidentsArchiveQuery;
  12 +import org.apache.commons.collections.CollectionUtils;
10 13 import org.springframework.beans.BeanUtils;
11 14 import org.springframework.beans.factory.annotation.Autowired;
12 15 import org.springframework.data.domain.Sort;
13 16  
14 17  
15 18  
16 19  
17 20  
18 21  
... ... @@ -86,43 +89,87 @@
86 89 PreEugenicsBaseModel one = mongoTemplate.findOne(query, PreEugenicsBaseModel.class);
87 90 if (one == null) {
88 91 if (StringUtils.isNotEmpty(cardNo)) {
89   - ResidentsArchiveModel model = mongoTemplate.findOne(Query.query(Criteria.where("certificateNum").is(cardNo)), ResidentsArchiveModel.class);
  92 + ResidentsArchiveModel model = mongoTemplate.findOne(Query.query(Criteria.where("certificateNum").is(cardNo).and("hospitalId").is(hospitalId)), ResidentsArchiveModel.class);
90 93 if (model == null) {
91 94 return new BaseResponse();
92 95 }
  96 + ResidentsArchiveModel model1 = mongoTemplate.findOne(Query.query(Criteria.where("certificateNum").is(model.getSpouseCardNo()).and("hospitalId").is(hospitalId)), ResidentsArchiveModel.class);
  97 +
  98 + ResidentsArchiveModel manModel = null;
  99 + ResidentsArchiveModel wamenModel = null;
  100 +
  101 + //男
  102 + if ("5d0b782f-b61b-441b-b8c5-4bf55eece273".equals(model.getSex()))
  103 + {
  104 + manModel = model;
  105 + wamenModel = model1;
  106 + }
  107 + else
  108 + {
  109 + wamenModel= model;
  110 + manModel = model1;
  111 + }
93 112 one = new PreEugenicsBaseModel();
94   - one.setWifeName(model.getUsername());
95   - one.setWifeNation(model.getNationId());
96   - one.setWifeBirthday(model.getBirthday());
97   - one.setWifeAge(DateUtil.getAge(model.getBirthday()).toString());
98   - one.setWifeEducational(model.getLevelTypeId());
99   - one.setWifeCardType(model.getCertificateTypeId());
100   - one.setWifeCardNo(model.getCertificateNum());
101   - one.setWifeCareer(model.getProfessionTypeId());
102   - one.setWifePhone(model.getPhone());
103   - one.setWifeAccountNature(model.getCensusTypeId());
  113 + ////男
  114 + if (manModel != null)
  115 + {
  116 + //男性基本信息
  117 + one.setHusbandName(manModel.getUsername());
  118 + one.setHusbandNation(manModel.getNationId());
  119 + one.setHusbandBirthday(manModel.getBirthday());
  120 + one.setHusbandAge(DateUtil.getAge(manModel.getBirthday()).toString());
  121 + one.setHusbandEducational(manModel.getLevelTypeId());
  122 + one.setHusbandCardType(manModel.getCertificateTypeId());
  123 + one.setHusbandCardNo(manModel.getCertificateNum());
  124 + one.setHusbandCareer(manModel.getProfessionTypeId());
  125 + one.setHusbandPhone(manModel.getPhone());
  126 + one.setHusbandAccountNature(manModel.getCensusTypeId());
104 127  
105   - // 妇女户口地址
106   - one.setWifeAccountProvince(model.getProvinceRegisterId());
107   - one.setWifeAccountCity(model.getCityRegisterId());
108   - one.setWifeAccountArea(model.getAreaRegisterId());
109   - one.setWifeAccountStreet(model.getStreetRegisterId());
110   - one.setWifeAccountAddress(model.getAddressRegister());
  128 + // 男性户口地址
  129 + one.setHusbandAccountProvince(manModel.getProvinceRegisterId());
  130 + one.setHusbandAccountCity(manModel.getCityRegisterId());
  131 + one.setHusbandAccountArea(manModel.getAreaRegisterId());
  132 + one.setHusbandAccountStreet(manModel.getStreetRegisterId());
  133 + one.setHusbandAccountAddress(manModel.getAddressRegister());
111 134  
112 135  
113   - // 妇女居住地
114   - one.setWifeCurrentProvince(model.getProvinceId());
115   - one.setWifeCurrentCity(model.getCityId());
116   - one.setWifeCurrentArea(model.getAreaId());
117   - one.setWifeCurrentStreet(model.getStreetId());
118   - one.setWifeCurrentAddress(model.getAddress());
  136 + // 男性居住地
  137 + one.setHusbandCurrentProvince(manModel.getProvinceId());
  138 + one.setHusbandCurrentCity(manModel.getCityId());
  139 + one.setHusbandCurrentArea(manModel.getAreaId());
  140 + one.setHusbandCurrentStreet(manModel.getStreetId());
  141 + one.setHusbandCurrentAddress(manModel.getAddress());
119 142  
120   - // 丈夫信息
121   - one.setHusbandName(model.getSpouseName());
122   - one.setHusbandPhone(model.getSpousePhone());
123   - one.setHusbandCardType(model.getSpouseCertTypeId());
124   - one.setHusbandCardNo(model.getSpouseCardNo());
  143 + }
  144 + if (wamenModel != null)
  145 + {
  146 + //女性性基本信息
  147 + one.setWifeName(wamenModel.getUsername());
  148 + one.setWifeNation(wamenModel.getNationId());
  149 + one.setWifeBirthday(wamenModel.getBirthday());
  150 + one.setWifeAge(DateUtil.getAge(wamenModel.getBirthday()).toString());
  151 + one.setWifeEducational(wamenModel.getLevelTypeId());
  152 + one.setWifeCardType(wamenModel.getCertificateTypeId());
  153 + one.setWifeCardNo(wamenModel.getCertificateNum());
  154 + one.setWifeCareer(wamenModel.getProfessionTypeId());
  155 + one.setWifePhone(wamenModel.getPhone());
  156 + one.setWifeAccountNature(wamenModel.getCensusTypeId());
125 157  
  158 + // 妇女户口地址
  159 + one.setWifeAccountProvince(wamenModel.getProvinceRegisterId());
  160 + one.setWifeAccountCity(wamenModel.getCityRegisterId());
  161 + one.setWifeAccountArea(wamenModel.getAreaRegisterId());
  162 + one.setWifeAccountStreet(wamenModel.getStreetRegisterId());
  163 + one.setWifeAccountAddress(wamenModel.getAddressRegister());
  164 +
  165 + // 妇女居住地
  166 + one.setWifeCurrentProvince(wamenModel.getProvinceId());
  167 + one.setWifeCurrentCity(wamenModel.getCityId());
  168 + one.setWifeCurrentArea(wamenModel.getAreaId());
  169 + one.setWifeCurrentStreet(wamenModel.getStreetId());
  170 + one.setWifeCurrentAddress(wamenModel.getAddress());
  171 + }
  172 +
126 173 BaseResponse baseResponse = new BaseResponse();
127 174 baseResponse.setObject(one);
128 175 return baseResponse;
... ... @@ -166,12 +213,6 @@
166 213 model.setHospitalId(hospitalId);
167 214 model.setCreated(new Date());
168 215 mongoTemplate.insert(model);
169   - //陵城区妇幼保健院
170   - if ("2100002042".equals(hospitalId))
171   - {
172   - saveLis(model);
173   - }
174   -
175 216 return new BaseResponse();
176 217 }
177 218  
... ... @@ -462,6 +503,15 @@
462 503 }
463 504 mongoTemplate.remove(Query.query(Criteria.where("id").is(id)), PreEugenicsBaseModel.class);
464 505 return new BaseResponse();
  506 + }
  507 +
  508 + @Override
  509 + public BaseResponse setPreEugenicsCheckItem(String id) {
  510 + PreEugenicsBaseModel model = mongoTemplate.findOne(Query.query(Criteria.where("id").is(id)), PreEugenicsBaseModel.class);
  511 + if (model != null) {
  512 + lcfyLisService.save(model);
  513 + }
  514 + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
465 515 }
466 516 }