diff --git a/platform-common/src/main/java/com/lyms/platform/common/dao/BaseMongoDAOImpl.java b/platform-common/src/main/java/com/lyms/platform/common/dao/BaseMongoDAOImpl.java index 67e310e..23b66b9 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/dao/BaseMongoDAOImpl.java +++ b/platform-common/src/main/java/com/lyms/platform/common/dao/BaseMongoDAOImpl.java @@ -156,7 +156,8 @@ public class BaseMongoDAOImpl implements BaseMongoDAO { || "SyncDataModel".equals(data.getClass().getSimpleName()) || "SmsConfigModel".equals(data.getClass().getSimpleName()) || "OperateLogModel".equals(data.getClass().getSimpleName()) - || "TrackDown".equals(data.getClass().getSimpleName())) { + || "TrackDown".equals(data.getClass().getSimpleName()) + || "ArchiveData".equals(data.getClass().getSimpleName())) { if(!"LisReport".equals(data.getClass().getSimpleName())){ //ExceptionUtils.catchException("NotSerializable for class :"+data.getClass().getSimpleName() ); } diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java index 9fa6cf9..a9d04d9 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java @@ -26,7 +26,7 @@ public class LymsEncodeUtil { //String encrypt = aesEncrypt("com.lyms.platform.pojo.PatientWeight", key); System.out.println("加密后:" + encrypt); - String json = aesDecrypt("26EB0301C4A2410E90985A3E55856E4B394230836B32B93AD3C083D37C3C4E0BEA7B0DB8B7C18941599742DD2315584A", key); + String json = aesDecrypt("26EB0301C4A2410E90985A3E55856E4BDD1E0738D7612389D1064D8FEA3E8BA03E6DE745639AC53F4ECD0A961CF459E4", key); System.out.println("解密后:" + json); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CancerScreeningController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CancerScreeningController.java index b3a142a..7afe5ba 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CancerScreeningController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CancerScreeningController.java @@ -34,9 +34,9 @@ public class CancerScreeningController extends BaseController { @ResponseBody @RequestMapping(value="/queryCanSrcInfo",method = RequestMethod.GET) @TokenRequired - public BaseResponse queryCanSrcInfo(@RequestParam(required = false) String cardNo,@RequestParam(required = false) String vaCardNo, + public BaseResponse queryCanSrcInfo(@RequestParam(required = false) String cardNo,@RequestParam(required = false) String vcCardNo, HttpServletRequest request) { - return cancerScreenService.queryCanSrcInfo(cardNo,vaCardNo,getUserId(request)); + return cancerScreenService.queryCanSrcInfo(cardNo,vcCardNo,getUserId(request)); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java index bc45691..92cb112 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java @@ -185,11 +185,16 @@ public class RemoteController extends BaseController { map.put("phone",archiveData.getPhone()); map.put("created", DateUtil.getyyyy_MM_dd_hms(archiveData.getCreated())); - param.put("id", archiveData.getAssistUserId()); - List userModels = assistBuildService.queryAssistBuildUsers(param); - if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(userModels)) { - map.put("assistUser", userModels.get(0).getUserName()); + String assistUser = ""; + if (StringUtils.isNotEmpty(archiveData.getAssistUserId())) + { + param.put("id", archiveData.getAssistUserId()); + List userModels = assistBuildService.queryAssistBuildUsers(param); + if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(userModels)) { + assistUser = userModels.get(0).getUserName(); + } } + map.put("assistUser", assistUser); map.put("isBuild", archiveData.getBuildDate() == null ? "true" : "false"); dataList.add(map); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java index 575038a..6a1c35a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java @@ -183,7 +183,7 @@ public class CancerScreeningFacade { } } - public BaseResponse queryCanSrcInfo(String cardNo, String vaCardNo, Integer userId) { + public BaseResponse queryCanSrcInfo(String cardNo, String vcCardNo, Integer userId) { List residents = new ArrayList<>(); ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery(); @@ -194,10 +194,10 @@ public class CancerScreeningFacade { residents = residentsArchiveService.queryResident(archiveQuery); //使用就诊卡号查询,先用登录ID查询属于哪家医院,然后查询到该居民的身份证号,调出所有的建档记录 - }else if (StringUtils.isNotEmpty(vaCardNo)){ + }else if (StringUtils.isNotEmpty(vcCardNo)){ //通过用户ID查询医院ID String hospitalId = autoMatchFacade.getHospitalId(userId); - archiveQuery.setVcCardNo(vaCardNo); + archiveQuery.setVcCardNo(vcCardNo); archiveQuery.setHospitalId(hospitalId); List archiveModelList = residentsArchiveService.queryResident(archiveQuery); if (CollectionUtils.isNotEmpty(archiveModelList)){ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java index 624f5ce..28fc13d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java @@ -159,7 +159,17 @@ public class SyncDataTaskService { } else { - boo = mongoSyncService.syncData(model.getAction(), model.getDataId(), model.getClassName(), model.getJsonData()); + if ("26EB0301C4A2410E90985A3E55856E4BDD1E0738D7612389D1064D8FEA3E8BA03E6DE745639AC53F4ECD0A961CF459E4".equals( + model.getClassName())) + { + System.out.println("archiveData="+model.getClassName()); + boo = true; + } + else + { + boo = mongoSyncService.syncData(model.getAction(), model.getDataId(), model.getClassName(), model.getJsonData()); + } + } if (boo) { ids.append(model.getId());