jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 139a333cf2a582a553ce83a410c4ba3795e3d05b

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

两癌筛查

Showing 6 changed files with 28 additions and 12 deletions

platform-common/src/main/java/com/lyms/platform/common/dao/BaseMongoDAOImpl.java View file @ 139a333
... ... @@ -156,7 +156,8 @@
156 156 || "SyncDataModel".equals(data.getClass().getSimpleName())
157 157 || "SmsConfigModel".equals(data.getClass().getSimpleName())
158 158 || "OperateLogModel".equals(data.getClass().getSimpleName())
159   - || "TrackDown".equals(data.getClass().getSimpleName())) {
  159 + || "TrackDown".equals(data.getClass().getSimpleName())
  160 + || "ArchiveData".equals(data.getClass().getSimpleName())) {
160 161 if(!"LisReport".equals(data.getClass().getSimpleName())){
161 162 //ExceptionUtils.catchException("NotSerializable for class :"+data.getClass().getSimpleName() );
162 163 }
platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java View file @ 139a333
... ... @@ -26,7 +26,7 @@
26 26  
27 27 //String encrypt = aesEncrypt("com.lyms.platform.pojo.PatientWeight", key); System.out.println("加密后：" + encrypt);
28 28  
29   - String json = aesDecrypt("26EB0301C4A2410E90985A3E55856E4B394230836B32B93AD3C083D37C3C4E0BEA7B0DB8B7C18941599742DD2315584A", key);
  29 + String json = aesDecrypt("26EB0301C4A2410E90985A3E55856E4BDD1E0738D7612389D1064D8FEA3E8BA03E6DE745639AC53F4ECD0A961CF459E4", key);
30 30 System.out.println("解密后：" + json);
31 31  
32 32 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CancerScreeningController.java View file @ 139a333
... ... @@ -34,9 +34,9 @@
34 34 @ResponseBody
35 35 @RequestMapping(value="/queryCanSrcInfo",method = RequestMethod.GET)
36 36 @TokenRequired
37   - public BaseResponse queryCanSrcInfo(@RequestParam(required = false) String cardNo,@RequestParam(required = false) String vaCardNo,
  37 + public BaseResponse queryCanSrcInfo(@RequestParam(required = false) String cardNo,@RequestParam(required = false) String vcCardNo,
38 38 HttpServletRequest request) {
39   - return cancerScreenService.queryCanSrcInfo(cardNo,vaCardNo,getUserId(request));
  39 + return cancerScreenService.queryCanSrcInfo(cardNo,vcCardNo,getUserId(request));
40 40 }
41 41  
42 42  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java View file @ 139a333
... ... @@ -185,11 +185,16 @@
185 185 map.put("phone",archiveData.getPhone());
186 186 map.put("created", DateUtil.getyyyy_MM_dd_hms(archiveData.getCreated()));
187 187  
188   - param.put("id", archiveData.getAssistUserId());
189   - List<AssistBuildUserModel> userModels = assistBuildService.queryAssistBuildUsers(param);
190   - if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(userModels)) {
191   - map.put("assistUser", userModels.get(0).getUserName());
  188 + String assistUser = "";
  189 + if (StringUtils.isNotEmpty(archiveData.getAssistUserId()))
  190 + {
  191 + param.put("id", archiveData.getAssistUserId());
  192 + List<AssistBuildUserModel> userModels = assistBuildService.queryAssistBuildUsers(param);
  193 + if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(userModels)) {
  194 + assistUser = userModels.get(0).getUserName();
  195 + }
192 196 }
  197 + map.put("assistUser", assistUser);
193 198  
194 199 map.put("isBuild", archiveData.getBuildDate() == null ? "true" : "false");
195 200 dataList.add(map);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java View file @ 139a333
... ... @@ -183,7 +183,7 @@
183 183 }
184 184 }
185 185  
186   - public BaseResponse queryCanSrcInfo(String cardNo, String vaCardNo, Integer userId) {
  186 + public BaseResponse queryCanSrcInfo(String cardNo, String vcCardNo, Integer userId) {
187 187 List<ResidentsArchiveModel> residents = new ArrayList<>();
188 188  
189 189 ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery();
190 190  
... ... @@ -194,10 +194,10 @@
194 194 residents = residentsArchiveService.queryResident(archiveQuery);
195 195  
196 196 //使用就诊卡号查询,先用登录ID查询属于哪家医院,然后查询到该居民的身份证号,调出所有的建档记录
197   - }else if (StringUtils.isNotEmpty(vaCardNo)){
  197 + }else if (StringUtils.isNotEmpty(vcCardNo)){
198 198 //通过用户ID查询医院ID
199 199 String hospitalId = autoMatchFacade.getHospitalId(userId);
200   - archiveQuery.setVcCardNo(vaCardNo);
  200 + archiveQuery.setVcCardNo(vcCardNo);
201 201 archiveQuery.setHospitalId(hospitalId);
202 202 List<ResidentsArchiveModel> archiveModelList = residentsArchiveService.queryResident(archiveQuery);
203 203 if (CollectionUtils.isNotEmpty(archiveModelList)){
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java View file @ 139a333
... ... @@ -159,7 +159,17 @@
159 159 }
160 160 else
161 161 {
162   - boo = mongoSyncService.syncData(model.getAction(), model.getDataId(), model.getClassName(), model.getJsonData());
  162 + if ("26EB0301C4A2410E90985A3E55856E4BDD1E0738D7612389D1064D8FEA3E8BA03E6DE745639AC53F4ECD0A961CF459E4".equals(
  163 + model.getClassName()))
  164 + {
  165 + System.out.println("archiveData="+model.getClassName());
  166 + boo = true;
  167 + }
  168 + else
  169 + {
  170 + boo = mongoSyncService.syncData(model.getAction(), model.getDataId(), model.getClassName(), model.getJsonData());
  171 + }
  172 +
163 173 }
164 174 if (boo) {
165 175 ids.append(model.getId());