Commit 444878ba6365cad7b5386fb55e5848b30ab979b0
Exists in
master
and in
1 other branch
Merge remote-tracking branch 'origin/master'
Showing 11 changed files
- platform-dal/src/main/java/com/lyms/platform/query/FolicAcidQuery.java
- platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
- platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java
- platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/PregPatientinfo.java
- platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/ConnTools.java
- platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolicAcidController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FunvCommonUtil.java
platform-dal/src/main/java/com/lyms/platform/query/FolicAcidQuery.java
View file @
444878b
... | ... | @@ -76,7 +76,7 @@ |
76 | 76 | condition = condition.and("yn", yn, MongoOper.IS); |
77 | 77 | } |
78 | 78 | if (highRisk!=null) { |
79 | - condition = condition.and("highRisk", highRisk, MongoOper.IS); | |
79 | + condition = condition.and("highRisk", highRisk, MongoOper.LIKE); | |
80 | 80 | } |
81 | 81 | Criteria c1 = null; |
82 | 82 | if(null!=drawTimeStart){ |
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
View file @
444878b
... | ... | @@ -108,8 +108,17 @@ |
108 | 108 | //医院id |
109 | 109 | private List<String> hospitalList; |
110 | 110 | |
111 | + //档案编号 | |
112 | + private String fileCode; | |
111 | 113 | |
114 | + public String getFileCode() { | |
115 | + return fileCode; | |
116 | + } | |
112 | 117 | |
118 | + public void setFileCode(String fileCode) { | |
119 | + this.fileCode = fileCode; | |
120 | + } | |
121 | + | |
113 | 122 | public String getProvinceRegisterId() { |
114 | 123 | return provinceRegisterId; |
115 | 124 | } |
... | ... | @@ -847,7 +856,8 @@ |
847 | 856 | MongoCondition con1 = MongoCondition.newInstance("phone", queryNo, MongoOper.IS); |
848 | 857 | MongoCondition con2 = MongoCondition.newInstance("username", queryNo, MongoOper.IS); |
849 | 858 | MongoCondition con3 = MongoCondition.newInstance("cardNo", queryNo, MongoOper.IS); |
850 | - c1= c.orCondition(new MongoCondition[]{con1, con2, con3}).getCriteria(); | |
859 | + MongoCondition con4 = MongoCondition.newInstance("fileCode", queryNo, MongoOper.IS); | |
860 | + c1= c.orCondition(new MongoCondition[]{con1, con2, con3,con4}).getCriteria(); | |
851 | 861 | } |
852 | 862 | |
853 | 863 | if (lastCheckEmployeeId != null) { |
platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java
View file @
444878b
... | ... | @@ -107,7 +107,7 @@ |
107 | 107 | condition = condition.and("id", id, MongoOper.IS); |
108 | 108 | } |
109 | 109 | if (StringUtils.isNotBlank(username)) { |
110 | - condition = condition.and("username", username, MongoOper.IS); | |
110 | + condition = condition.and("username", username, MongoOper.LIKE); | |
111 | 111 | } |
112 | 112 | if (StringUtils.isNotBlank(phone)) { |
113 | 113 | condition = condition.and("phone", phone, MongoOper.IS); |
platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/PregPatientinfo.java
View file @
444878b
... | ... | @@ -26,10 +26,18 @@ |
26 | 26 | private String P_MOBILEPHONE; |
27 | 27 | private String P_IDNUM; |
28 | 28 | private Date P_BIRTHDAY; |
29 | + private String BIRTH; | |
29 | 30 | private Date CREATED; |
30 | 31 | //门诊或者是住院 |
31 | 32 | private String SICKTYPE; |
32 | 33 | |
34 | + public String getBIRTH() { | |
35 | + return BIRTH; | |
36 | + } | |
37 | + | |
38 | + public void setBIRTH(String BIRTH) { | |
39 | + this.BIRTH = BIRTH; | |
40 | + } | |
33 | 41 | |
34 | 42 | public String getSICKTYPE() { |
35 | 43 | return SICKTYPE; |
platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/ConnTools.java
View file @
444878b
... | ... | @@ -15,7 +15,7 @@ |
15 | 15 | */ |
16 | 16 | public class ConnTools { |
17 | 17 | private static String hisDirverClassName = "com.microsoft.sqlserver.jdbc.SQLServerDriver"; |
18 | - private static String hisUrl = "jdbc:sqlserver://168.254.0.7:1443; DatabaseName=THIS4"; | |
18 | + private static String hisUrl = "jdbc:sqlserver://168.254.0.7:1433; DatabaseName=THIS4"; | |
19 | 19 | private static String hisUser = "sa"; |
20 | 20 | private static String hisPassword = "ccnms05*"; |
21 | 21 |
platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java
View file @
444878b
... | ... | @@ -26,6 +26,7 @@ |
26 | 26 | import java.io.File; |
27 | 27 | import java.sql.Connection; |
28 | 28 | import java.sql.SQLException; |
29 | +import java.text.SimpleDateFormat; | |
29 | 30 | import java.util.*; |
30 | 31 | |
31 | 32 | /** |
... | ... | @@ -335,7 +336,7 @@ |
335 | 336 | Connection conn = com.lyms.hospitalapi.qhdfy.ConnTools.makeHisConnection(); |
336 | 337 | QueryRunner queryRunner = new QueryRunner(); |
337 | 338 | try { |
338 | - List<PregPatientinfo> list = queryRunner.query(conn, "select top 1 patid as P_ID,cardno as P_CARDNO,hzxm as P_NAME, sex as P_SEX, birth as P_BIRTHDAY, sfzh as P_IDNUM, lxdh as P_MOBILEPHONE from SF_BRXXK where cardno= '"+cardNo+"'", new BeanListHandler<PregPatientinfo>(PregPatientinfo.class)); | |
339 | + List<PregPatientinfo> list = queryRunner.query(conn, "select top 1 patid as P_ID,hzxm as P_NAME, sex as P_SEX, birth as BIRTH, sfzh as P_CARDNO, lxdh as P_MOBILEPHONE from SF_BRXXK where cardno= '"+cardNo+"'", new BeanListHandler<PregPatientinfo>(PregPatientinfo.class)); | |
339 | 340 | if (list.size() > 0) { |
340 | 341 | for (PregPatientinfo info:list) { |
341 | 342 | Map<String,Object> map = new HashMap<>(); |
... | ... | @@ -348,7 +349,7 @@ |
348 | 349 | map.put("name", info.getP_NAME()); |
349 | 350 | map.put("cardNo", info.getP_CARDNO()); |
350 | 351 | map.put("phone", info.getP_MOBILEPHONE()); |
351 | - map.put("birth", DateUtil.getyyyy_MM_dd(info.getP_BIRTHDAY())); | |
352 | + map.put("birth", DateUtil.getyyyy_MM_dd(parseYmd(info.getBIRTH()))); | |
352 | 353 | result.add(map); |
353 | 354 | } |
354 | 355 | } |
... | ... | @@ -359,6 +360,19 @@ |
359 | 360 | } |
360 | 361 | } |
361 | 362 | return result; |
363 | + } | |
364 | + | |
365 | + | |
366 | + public static Date parseYmd(String s) { | |
367 | + SimpleDateFormat ymd = new SimpleDateFormat("yyyyMMdd"); | |
368 | + if (s == null) { | |
369 | + return null; | |
370 | + } | |
371 | + try { | |
372 | + return ymd.parse(s); | |
373 | + } catch (Exception e) { | |
374 | + return null; | |
375 | + } | |
362 | 376 | } |
363 | 377 | |
364 | 378 | public List<Map<String,Object>> queryHisBabyDiagnosis(String blNo) { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolicAcidController.java
View file @
444878b
... | ... | @@ -42,10 +42,11 @@ |
42 | 42 | //获取单个发放记录 |
43 | 43 | @RequestMapping(value = "/getFolicAcid", method = RequestMethod.GET) |
44 | 44 | @ResponseBody |
45 | -// @TokenRequired | |
45 | + @TokenRequired | |
46 | 46 | public BaseObjectResponse getFolicAcid(@Valid FolicAcidQueryRequest folicAcidQueryRequest, |
47 | 47 | HttpServletRequest request) { |
48 | - return folicAcidFacade.getFolicAcid(folicAcidQueryRequest); | |
48 | + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); | |
49 | + return folicAcidFacade.getFolicAcid(folicAcidQueryRequest,loginState.getId()); | |
49 | 50 | } |
50 | 51 | |
51 | 52 | //叶酸发放管理 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
View file @
444878b
... | ... | @@ -441,6 +441,65 @@ |
441 | 441 | return "initCardNo finish - " + a; |
442 | 442 | } |
443 | 443 | |
444 | + | |
445 | + | |
446 | + @RequestMapping(value = "/modifyRiskFactor", method = RequestMethod.GET) | |
447 | + @ResponseBody | |
448 | + public String modifyRiskFactor(@RequestParam(required = true) String hid) { | |
449 | + PatientsQuery patientQuery = new PatientsQuery(); | |
450 | + patientQuery.setYn(YnEnums.YES.getId()); | |
451 | + patientQuery.setHospitalId(hid); | |
452 | + patientQuery.setrLevel("e637b361-99cf-41eb-84f2-f0dab596e928"); | |
453 | + | |
454 | + | |
455 | + List<Patients> patientses = patientsService.queryPatient(patientQuery); | |
456 | + int batchSize = 500; | |
457 | + int end = 0; | |
458 | + for (int i = 0; i < patientses.size(); i += batchSize) { | |
459 | + end = (end + batchSize); | |
460 | + if (end > patientses.size()) { | |
461 | + end = patientses.size(); | |
462 | + } | |
463 | + System.out.println("start:" + i + ",end:" + end); | |
464 | + final List<Patients> tempList = patientses.subList(i, end); | |
465 | + new Thread(new Runnable() { | |
466 | + @Override | |
467 | + public void run() { | |
468 | + if (CollectionUtils.isNotEmpty(tempList)) | |
469 | + { | |
470 | + for (Patients pat : tempList) { | |
471 | + if (pat != null) | |
472 | + { | |
473 | + String levelStr = pat.getRiskLevelId(); | |
474 | + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(levelStr)) | |
475 | + { | |
476 | + List<String> levels = JsonUtil.toList(levelStr, String.class); | |
477 | + if (CollectionUtils.isNotEmpty(levels) && levels.contains("e637b361-99cf-41eb-84f2-f0dab596e928") && levels.size() > 1) | |
478 | + { | |
479 | + List<String> rFactors = pat.getRiskFactorId(); | |
480 | + if (CollectionUtils.isNotEmpty(rFactors) && rFactors.contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6")) | |
481 | + { | |
482 | + rFactors.remove("d42eec03-aa86-45b8-a4e0-78a0ff365fb6"); | |
483 | + String resultLevel = JsonUtil.array2JsonString(levels.remove("e637b361-99cf-41eb-84f2-f0dab596e928")); | |
484 | + pat.setRiskLevelId(resultLevel); | |
485 | + patientsService.updatePatient(pat); | |
486 | + } | |
487 | + } | |
488 | + | |
489 | + } | |
490 | + | |
491 | + } | |
492 | + } | |
493 | + } | |
494 | + } | |
495 | + }).start(); | |
496 | + } | |
497 | + | |
498 | + return "modifyRiskFactor finish"; | |
499 | + } | |
500 | + | |
501 | + | |
502 | + | |
444 | 503 | public static void main(String[] a) { |
445 | 504 | try { |
446 | 505 | List<String> list = FileUtils.readLines(new File("D:\\temp\\qhdfy_lost1.csv")); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java
View file @
444878b
... | ... | @@ -15,6 +15,7 @@ |
15 | 15 | import com.lyms.platform.operate.web.request.FolicAcidAddRequest; |
16 | 16 | import com.lyms.platform.operate.web.request.FolicAcidQueryRequest; |
17 | 17 | import com.lyms.platform.operate.web.utils.CommonsHelper; |
18 | +import com.lyms.platform.operate.web.utils.FunvCommonUtil; | |
18 | 19 | import com.lyms.platform.permission.model.Organization; |
19 | 20 | import com.lyms.platform.permission.model.OrganizationQuery; |
20 | 21 | import com.lyms.platform.permission.model.Users; |
21 | 22 | |
22 | 23 | |
23 | 24 | |
24 | 25 | |
25 | 26 | |
26 | 27 | |
27 | 28 | |
28 | 29 | |
29 | 30 | |
... | ... | @@ -64,53 +65,66 @@ |
64 | 65 | |
65 | 66 | //判断是否需要给妇女快捷建档 |
66 | 67 | if (StringUtils.isEmpty(addRequest.getParentId())){ |
68 | + List<ResidentsArchiveModel> modelList = new ArrayList<>(); | |
67 | 69 | |
68 | 70 | ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery(); |
69 | 71 | archiveQuery.setYn(YnEnums.YES.getId()); |
70 | 72 | String hospitalId = autoMatchFacade.getHospitalId(userId); |
71 | 73 | archiveQuery.setHospitalId(hospitalId); |
72 | 74 | //判断证件号是否在同一家医院已经建档 |
73 | - if (StringUtils.isNotEmpty(addRequest.getCardNo())){ | |
75 | + if (StringUtils.isNotEmpty(addRequest.getCardNo())) { | |
74 | 76 | archiveQuery.setCertificateNum(addRequest.getCardNo()); |
75 | -// archiveQuery.setCertificateTypeId(addRequest.getCertificateTypeId()); | |
76 | - List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(archiveQuery); | |
77 | - if (CollectionUtils.isNotEmpty(modelList)){ | |
77 | + archiveQuery.setCertificateTypeId(addRequest.getCertificateTypeId()); | |
78 | + residentsArchiveService.queryResident(archiveQuery); | |
79 | + if (CollectionUtils.isNotEmpty(modelList)) { | |
78 | 80 | br.setErrorcode(ErrorCodeConstants.DATA_EXIST); |
79 | - br.setErrormsg("该证件号在医院已经建档"); | |
81 | + br.setErrormsg("该证件号在该医院已经建档"); | |
80 | 82 | return br; |
81 | - }else { | |
82 | - //进行建档 | |
83 | - ResidentsArchiveModel model = new ResidentsArchiveModel(); | |
84 | - model.setYn(YnEnums.YES.getId()); | |
85 | - model.setCreated(new Date()); | |
86 | - model.setModified(new Date()); | |
87 | - model.setPublishId(String.valueOf(userId)); | |
88 | - Users users = usersService.getUsers(userId); | |
89 | - if (users!=null && users.getYn()!=YnEnums.NO.getId()){ | |
90 | - model.setPublishName(users.getName()); | |
91 | - //建档医生 | |
92 | - model.setBuildDoctor(users.getName()); | |
93 | - } | |
94 | - model.setHospitalId(hospitalId); | |
83 | + } | |
84 | + } | |
95 | 85 | |
96 | - model.setUsername(addRequest.getUsername()); | |
97 | - model.setCertificateNum(addRequest.getCardNo()); | |
98 | - model.setCertificateTypeId(addRequest.getCertificateTypeId()); | |
99 | - model.setBirthday(addRequest.getBirthday()); | |
100 | - model.setAge(addRequest.getAge()); | |
101 | - model.setPhone(addRequest.getPhone()); | |
86 | + if (StringUtils.isNotEmpty(addRequest.getVcCardNo())){ | |
87 | + archiveQuery.setCertificateNum(null); | |
88 | + archiveQuery.setCertificateTypeId(null); | |
89 | + archiveQuery.setVcCardNo(addRequest.getVcCardNo()); | |
90 | + modelList = residentsArchiveService.queryResident(archiveQuery); | |
91 | + if (CollectionUtils.isNotEmpty(modelList)) { | |
92 | + br.setErrorcode(ErrorCodeConstants.DATA_EXIST); | |
93 | + br.setErrormsg("该就诊卡在该医院已经建档"); | |
94 | + return br; | |
95 | + } | |
96 | + } | |
102 | 97 | |
103 | - model.setSex(SystemConfig.WOMAN_ID); | |
104 | - //建档日期 | |
105 | - model.setBuildDay(DateUtil.getYmd(new Date())); | |
98 | + //进行建档 | |
99 | + ResidentsArchiveModel model = new ResidentsArchiveModel(); | |
100 | + model.setYn(YnEnums.YES.getId()); | |
101 | + model.setCreated(new Date()); | |
102 | + model.setModified(new Date()); | |
103 | + model.setPublishId(String.valueOf(userId)); | |
104 | + Users users = usersService.getUsers(userId); | |
105 | + if (users!=null && users.getYn()!=YnEnums.NO.getId()){ | |
106 | + model.setPublishName(users.getName()); | |
107 | + //建档医生 | |
108 | + model.setBuildDoctor(users.getName()); | |
109 | + } | |
110 | + model.setHospitalId(hospitalId); | |
106 | 111 | |
107 | - model.setVcCardNo(addRequest.getVcCardNo()); | |
112 | + model.setUsername(addRequest.getUsername()); | |
113 | + model.setCertificateNum(addRequest.getCardNo()); | |
114 | + model.setCertificateTypeId(addRequest.getCertificateTypeId()); | |
115 | + model.setBirthday(addRequest.getBirthday()); | |
116 | + model.setAge(addRequest.getAge()); | |
117 | + model.setPhone(addRequest.getPhone()); | |
108 | 118 | |
109 | - ResidentsArchiveModel residentsArchiveModel = residentsArchiveService.addResident(model); | |
119 | + model.setSex(SystemConfig.WOMAN_ID); | |
120 | + //建档日期 | |
121 | + model.setBuildDay(DateUtil.getyyyy_MM_dd(new Date())); | |
110 | 122 | |
111 | - id = addOrUpdate(addRequest,userId,residentsArchiveModel.getId()); | |
112 | - } | |
113 | - } | |
123 | + model.setVcCardNo(addRequest.getVcCardNo()); | |
124 | + | |
125 | + ResidentsArchiveModel residentsArchiveModel = residentsArchiveService.addResident(model); | |
126 | + | |
127 | + id = addOrUpdate(addRequest,userId,residentsArchiveModel.getId()); | |
114 | 128 | }else { |
115 | 129 | id = addOrUpdate(addRequest,userId,addRequest.getParentId()); |
116 | 130 | } |
117 | 131 | |
... | ... | @@ -150,12 +164,14 @@ |
150 | 164 | return id; |
151 | 165 | } |
152 | 166 | |
153 | - public BaseObjectResponse getFolicAcid(FolicAcidQueryRequest queryRequest){ | |
167 | + public BaseObjectResponse getFolicAcid(FolicAcidQueryRequest queryRequest,Integer userId){ | |
154 | 168 | Map<String, Object> archiveMap = null; |
155 | 169 | FolicAcid folicAcid = null; |
156 | 170 | ResidentsArchiveModel archiveModel = null; |
157 | 171 | Map<String, Object> resultMap = new HashMap<>(); |
158 | 172 | |
173 | + String hospitalId = autoMatchFacade.getHospitalId(userId); | |
174 | + | |
159 | 175 | //查询妇女信息 |
160 | 176 | if (StringUtils.isNotEmpty(queryRequest.getId())){ |
161 | 177 | folicAcid = folicAcidService.getFolicAcid(queryRequest.getId()); |
162 | 178 | |
... | ... | @@ -164,10 +180,11 @@ |
164 | 180 | } |
165 | 181 | }else { |
166 | 182 | ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery(); |
167 | - archiveQuery.setYn(1); | |
168 | - archiveQuery.setHospitalId(queryRequest.getHospitalId()); | |
183 | + archiveQuery.setYn(YnEnums.YES.getId()); | |
184 | + archiveQuery.setHospitalId(hospitalId); | |
169 | 185 | if (StringUtils.isNotEmpty(queryRequest.getCardNo())){ |
170 | 186 | archiveQuery.setCertificateNum(queryRequest.getCardNo()); |
187 | + archiveQuery.setCertificateTypeId(queryRequest.getCertificateTypeId()); | |
171 | 188 | List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(archiveQuery); |
172 | 189 | if (CollectionUtils.isNotEmpty(modelList)){ |
173 | 190 | archiveModel = modelList.get(0); |
... | ... | @@ -316,7 +333,7 @@ |
316 | 333 | ResidentsArchiveModel model = residentsArchiveService.getResident(data.getParentId()); |
317 | 334 | map.put("username",model.getUsername()); |
318 | 335 | map.put("certificateNum",model.getCertificateNum()); |
319 | - map.put("phone",model.getPhone()); | |
336 | + map.put("phone", FunvCommonUtil.getXingPhone(model.getPhone())); | |
320 | 337 | map.put("drawTime", DateUtil.getyyyy_MM_dd(data.getDrawTime())); |
321 | 338 | map.put("drawCount", data.getDrawCount()); |
322 | 339 | if (data.getPregnancyType()!=null){ |
... | ... | @@ -344,6 +361,15 @@ |
344 | 361 | baseListResponse.setPageInfo(folicAcidQuery.getPageInfo()); |
345 | 362 | return baseListResponse; |
346 | 363 | } |
364 | + | |
365 | + | |
366 | + | |
367 | + public static void main(String[] str) { | |
368 | + String p = "13678024706"; | |
369 | + String a = p.substring(0,3)+"****"+p.substring(7,11); | |
370 | + System.out.print("哈哈" + a); | |
371 | + } | |
372 | + | |
347 | 373 | |
348 | 374 | public BaseResponse deleteFolicAcid(String id,Integer userId){ |
349 | 375 | BaseResponse br = new BaseResponse(); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
View file @
444878b
... | ... | @@ -18,6 +18,7 @@ |
18 | 18 | import com.lyms.platform.operate.web.result.ResidentsArchiveHistoryResult; |
19 | 19 | import com.lyms.platform.operate.web.result.ResidentsArchiveResult; |
20 | 20 | import com.lyms.platform.operate.web.utils.CommonsHelper; |
21 | +import com.lyms.platform.operate.web.utils.FunvCommonUtil; | |
21 | 22 | import com.lyms.platform.operate.web.utils.MessageCenterService; |
22 | 23 | import com.lyms.platform.permission.model.Organization; |
23 | 24 | import com.lyms.platform.permission.model.Users; |
24 | 25 | |
... | ... | @@ -27,11 +28,8 @@ |
27 | 28 | import com.lyms.platform.pojo.PremaritalCheckup; |
28 | 29 | import com.lyms.platform.pojo.ResidentsArchiveModel; |
29 | 30 | import com.lyms.platform.pojo.SmsConfigModel; |
30 | -import com.lyms.platform.query.BasicConfigQuery; | |
31 | 31 | import com.lyms.platform.query.PremaritalCheckupQuery; |
32 | 32 | import com.lyms.platform.query.ResidentsArchiveQuery; |
33 | -import com.mongodb.util.JSON; | |
34 | -import net.sf.json.JSONObject; | |
35 | 33 | import org.apache.commons.collections.CollectionUtils; |
36 | 34 | import org.apache.commons.lang.StringUtils; |
37 | 35 | import org.springframework.beans.factory.annotation.Autowired; |
... | ... | @@ -194,7 +192,7 @@ |
194 | 192 | if (StringUtils.isNotEmpty(addRequest.getCertificateNum())){ |
195 | 193 | //判断该证件号码是否在该医院建档 |
196 | 194 | query.setCertificateNum(addRequest.getCertificateNum()); |
197 | -// query.setCertificateTypeId(addRequest.getCertificateTypeId()); | |
195 | + query.setCertificateTypeId(addRequest.getCertificateTypeId()); | |
198 | 196 | List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(query); |
199 | 197 | if (CollectionUtils.isNotEmpty(modelList)){ |
200 | 198 | ResidentsArchiveModel archiveModel = modelList.get(0); |
... | ... | @@ -267,6 +265,7 @@ |
267 | 265 | if (StringUtils.isNotEmpty(addRequest.getCertificateNum())) { |
268 | 266 | //判断该证件号码是否在该医院建档 |
269 | 267 | query.setCertificateNum(addRequest.getCertificateNum()); |
268 | + query.setCertificateTypeId(addRequest.getCertificateTypeId()); | |
270 | 269 | List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(query); |
271 | 270 | if (CollectionUtils.isNotEmpty(modelList)){ |
272 | 271 | br.setErrorcode(ErrorCodeConstants.DATA_EXIST); |
... | ... | @@ -276,6 +275,8 @@ |
276 | 275 | } |
277 | 276 | |
278 | 277 | if (StringUtils.isNotEmpty(addRequest.getPhone())){ |
278 | + query.setCertificateTypeId(null); | |
279 | + query.setCertificateNum(null); | |
279 | 280 | query.setPhone(addRequest.getPhone()); |
280 | 281 | List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(query); |
281 | 282 | if (CollectionUtils.isNotEmpty(modelList)){ |
... | ... | @@ -286,7 +287,7 @@ |
286 | 287 | } |
287 | 288 | |
288 | 289 | if (StringUtils.isNotEmpty(addRequest.getVcCardNo())){ |
289 | - query.setCertificateNum(null); | |
290 | + query.setPhone(null); | |
290 | 291 | //判断该就诊卡号是否在该医院建档 |
291 | 292 | query.setVcCardNo(addRequest.getVcCardNo()); |
292 | 293 | List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(query); |
... | ... | @@ -458,6 +459,8 @@ |
458 | 459 | |
459 | 460 | List<Map> data = new ArrayList<>(); |
460 | 461 | |
462 | + String hospitalId = autoMatchFacade.getHospitalId(userId); | |
463 | + | |
461 | 464 | //查询条件 |
462 | 465 | ResidentsArchiveQuery query = new ResidentsArchiveQuery(); |
463 | 466 | query.setLimit(queryRequest.getLimit()); |
... | ... | @@ -465,6 +468,10 @@ |
465 | 468 | query.setNeed(need); |
466 | 469 | query.setYn(YnEnums.YES.getId()); |
467 | 470 | |
471 | + if (hospitalId!=null){ | |
472 | + query.setHospitalId(hospitalId); | |
473 | + } | |
474 | + | |
468 | 475 | //只查询女性 |
469 | 476 | query.setSex(SystemConfig.WOMAN_ID); |
470 | 477 | |
... | ... | @@ -473,7 +480,7 @@ |
473 | 480 | query.setAreaId(queryRequest.getAreaId()); |
474 | 481 | query.setVcCardNo(queryRequest.getVcCardNo()); |
475 | 482 | query.setCertificateNum(queryRequest.getCardNo()); |
476 | -// query.setCertificateTypeId(queryRequest.getCertificateTypeId()); | |
483 | + query.setCertificateTypeId(queryRequest.getCertificateTypeId()); | |
477 | 484 | query.setUsername(queryRequest.getUsername()); |
478 | 485 | query.setPhone(queryRequest.getPhone()); |
479 | 486 | |
... | ... | @@ -487,7 +494,7 @@ |
487 | 494 | map.put("age",DateUtil.getAge(DateUtil.parseYMD(model.getBirthday()))); |
488 | 495 | map.put("residence", CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService)); |
489 | 496 | map.put("isCheckup",queryPremaritalCheckup(model.getId(), model.getHospitalId())); |
490 | - map.put("phone",model.getPhone()); | |
497 | + map.put("phone", FunvCommonUtil.getXingPhone(model.getPhone())); | |
491 | 498 | map.put("buildDoctor",model.getBuildDoctor()); |
492 | 499 | data.add(map); |
493 | 500 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FunvCommonUtil.java
View file @
444878b
1 | +package com.lyms.platform.operate.web.utils; | |
2 | + | |
3 | +import org.apache.commons.lang.StringUtils; | |
4 | + | |
5 | +/** | |
6 | + * 妇女模块公共方法 | |
7 | + * | |
8 | + * Created by Administrator on 2016/12/13 0013. | |
9 | + */ | |
10 | +public class FunvCommonUtil { | |
11 | + | |
12 | + public static String HAVE = "有"; | |
13 | + public static String NOT = "无"; | |
14 | + public static String NORMAL = "正常"; | |
15 | + public static String ABNORMAL = "异常"; | |
16 | + public static String YES = "是"; | |
17 | + public static String NO = "否"; | |
18 | + | |
19 | + //返回中间四位数为*号的手机号 | |
20 | + public static String getXingPhone(String phone){ | |
21 | + if (StringUtils.isNotEmpty(phone)){ | |
22 | + String a = phone.substring(0,3)+"****"+phone.substring(7,11); | |
23 | + return a; | |
24 | + } | |
25 | + return ""; | |
26 | + } | |
27 | + | |
28 | + public static String havaOrNOString(String s,Integer type) { | |
29 | + if (StringUtils.isNotEmpty(s)) { | |
30 | + if (type == 1) { | |
31 | + if (s.equals("1")) { | |
32 | + return HAVE; | |
33 | + } else { | |
34 | + return NOT; | |
35 | + } | |
36 | + } else if (type == 2) { | |
37 | + if (s.equals("1")) { | |
38 | + return NORMAL; | |
39 | + } else { | |
40 | + return ABNORMAL; | |
41 | + } | |
42 | + } else if (type == 3) { | |
43 | + if (s.equals("1")) { | |
44 | + return YES; | |
45 | + } else { | |
46 | + return NO; | |
47 | + } | |
48 | + } | |
49 | + } | |
50 | + return ""; | |
51 | + } | |
52 | + | |
53 | + public static String havaOrNOInteger(Integer s,Integer type) { | |
54 | + if (s != null) { | |
55 | + if (type == 1) { | |
56 | + if (s == 1 ) { | |
57 | + return HAVE; | |
58 | + } else { | |
59 | + return NOT; | |
60 | + } | |
61 | + } else if (type == 2) { | |
62 | + if (s == 1) { | |
63 | + return NORMAL; | |
64 | + } else { | |
65 | + return ABNORMAL; | |
66 | + } | |
67 | + } else if (type == 3) { | |
68 | + if (s == 1) { | |
69 | + return YES; | |
70 | + } else { | |
71 | + return NO; | |
72 | + } | |
73 | + } | |
74 | + } | |
75 | + return ""; | |
76 | + } | |
77 | + | |
78 | +} |