From 98765fc0d026085c92ba4325b6355b06a98abd68 Mon Sep 17 00:00:00 2001 From: hyy-alt <1041001226@qq.com> Date: Fri, 4 Jun 2021 16:11:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ccsens/wisdomcar/service/OtherRecordsService.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/OtherRecordsService.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/OtherRecordsService.java index 6ed17829..9ac1c009 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/OtherRecordsService.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/OtherRecordsService.java @@ -97,10 +97,6 @@ public class OtherRecordsService implements IOtherRecordsService { PatientInformationRecordExample patientInformationRecordExample = new PatientInformationRecordExample(); patientInformationRecordExample.createCriteria().andTaskSubIdEqualTo(param.getId()); List patientInformationRecords = patientInformationRecordMapper.selectByExample(patientInformationRecordExample); - if(CollectionUtil.isEmpty(patientInformationRecords)){ - log.info("没有找到对应的的任务"); - throw new BaseException(CodeEnum.PARAM_ERROR); - } for (PatientInformationRecord patientInformationRecord : patientInformationRecords) { OtherRecordsVo.TypeAndComment query = new OtherRecordsVo.TypeAndComment(); query.setComment(patientInformationRecord.getContent()); From 1b5312025f249a913e5e2c9954200c24767b882e Mon Sep 17 00:00:00 2001 From: hyy-alt <1041001226@qq.com> Date: Fri, 4 Jun 2021 16:43:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ccsens/wisdomcar/service/OtherRecordsService.java | 8 ++++---- wisdomcar/src/main/resources/application.yml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/OtherRecordsService.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/OtherRecordsService.java index 9ac1c009..230356fe 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/OtherRecordsService.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/OtherRecordsService.java @@ -57,16 +57,16 @@ public class OtherRecordsService implements IOtherRecordsService { //通过t_patient_information_record里面的分解任务id 找到患者平车id 最新的 拿到患者平车id t_patient_information_record //拿到患者平车id ProjectVo.BindCar bindCar = stepTaskDao.getBindCarTaskId(param.getId()); - if (bindCar == null) { + /*if (bindCar == null) { log.info("没有找到绑定的平车信息：{}", param); throw new BaseException(CodeEnum.PARAM_ERROR); - } + }*/ //判断是否是图片是否为空 if (CollectionUtil.isNotEmpty(param.getPictures())){ for (int i = 0; i < param.getPictures().size(); i++) { PatientInformationRecord patientInformationRecord = new PatientInformationRecord(); patientInformationRecord.setId(snowflake.nextId()); - patientInformationRecord.setPatientCarId(bindCar.getId()); + patientInformationRecord.setPatientCarId(bindCar == null ? 0 : bindCar.getId()); patientInformationRecord.setTaskSubId(param.getId()); //上传图片 patientInformationRecord.setInformationType((byte) 0); @@ -80,7 +80,7 @@ public class OtherRecordsService implements IOtherRecordsService { if(!StringUtil.isEmpty(param.getRecords())) { PatientInformationRecord patientInformationRecord = new PatientInformationRecord(); patientInformationRecord.setId(snowflake.nextId()); - patientInformationRecord.setPatientCarId(bindCar.getId()); + patientInformationRecord.setPatientCarId(bindCar == null ? 0 : bindCar.getId()); patientInformationRecord.setTaskSubId(param.getId()); patientInformationRecord.setInformationType((byte) 1); patientInformationRecord.setContent(param.getRecords()); diff --git a/wisdomcar/src/main/resources/application.yml b/wisdomcar/src/main/resources/application.yml index 1ac895fc..a47f2a7b 100644 --- a/wisdomcar/src/main/resources/application.yml +++ b/wisdomcar/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: prod - include: common, util-prod + active: dev + include: common, util-dev From e39ed95940fe9022e2005daaba5d9e60cff5c4f3 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Fri, 4 Jun 2021 16:57:26 +0800 Subject: [PATCH 3/3] =?UTF-8?q?20210604=E6=B7=BB=E5=8A=A0=E6=82=A3?= =?UTF-8?q?=E8=80=85=E8=BF=94=E5=9B=9E=E6=82=A3=E8=80=85=E7=9A=84=E9=A1=B9?= =?UTF-8?q?=E7=9B=AEid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ccsens/wisdomcar/api/WisdomCarController.java | 4 ++-- .../com/ccsens/wisdomcar/bean/vo/WisdomCarVo.java | 13 +++++++++++++ .../ccsens/wisdomcar/service/IWisdomCarService.java | 2 +- .../ccsens/wisdomcar/service/WisdomCarService.java | 8 ++++++-- 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/WisdomCarController.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/WisdomCarController.java index 1e0a2dc6..0695d4e3 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/WisdomCarController.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/WisdomCarController.java @@ -45,9 +45,9 @@ public class WisdomCarController { @MustLogin @ApiOperation(value = "创建病例接口", notes = "") @RequestMapping(value = "/createCase", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse createCase(@ApiParam @Validated @RequestBody QueryDto params) { + public JsonResponse createCase(@ApiParam @Validated @RequestBody QueryDto params) { log.info("创建病例接口：{}", params); - wisdomCarService.createCase(params.getParam(), params.getUserId()); + WisdomCarVo.PatientProject patientProject = wisdomCarService.createCase(params.getParam(), params.getUserId()); log.info("创建病例接口"); return JsonResponse.newInstance().ok(); } diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/WisdomCarVo.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/WisdomCarVo.java index 1c0268b5..4ceed6b3 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/WisdomCarVo.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/WisdomCarVo.java @@ -21,6 +21,19 @@ public class WisdomCarVo { private String carNumber; } + @Data + @ApiModel("添加患者-返回项目id") + public static class PatientProject{ + @ApiModelProperty("平车ID") + private Long projectId; + + public PatientProject(Long projectId) { + this.projectId = projectId; + } + + public PatientProject() { + } + } @Data diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IWisdomCarService.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IWisdomCarService.java index c4992f56..c8e878ec 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IWisdomCarService.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IWisdomCarService.java @@ -26,7 +26,7 @@ public interface IWisdomCarService { * @param param 患者信息与家属信息 * @param userId 当前用户id */ - void createCase(CreateCaseDto.PatientInfo param, Long userId); + WisdomCarVo.PatientProject createCase(CreateCaseDto.PatientInfo param, Long userId); /** * 绑定平车 diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java index c627ca4b..6d447ce9 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java @@ -70,7 +70,8 @@ public class WisdomCarService implements IWisdomCarService { private PatientDataDao patientDataDao; @Override - public void createCase(CreateCaseDto.PatientInfo param, Long userId) { + public WisdomCarVo.PatientProject createCase(CreateCaseDto.PatientInfo param, Long userId) { + Long patientProjectId = null; //tall中需要添加的成员 MemberRoleDto.SaveMemberForTemplate saveMemberForTemplate = new MemberRoleDto.SaveMemberForTemplate(); List memberList = new ArrayList<>(); @@ -88,7 +89,7 @@ public class WisdomCarService implements IWisdomCarService { //设置病历号,redis自增 if (CollectionUtil.isNotEmpty(hospitalMembers)){ hospitalMember = hospitalMembers.get(0); - long incr = redisUtil.incr("医院_" + hospitalMember.getHospitalId().toString(), 1L); + long incr = redisUtil.incr("hospital_" + hospitalMember.getHospitalId().toString(), 1L); patient.setMedicalRecordNum(String.valueOf(incr)); } if (ObjectUtil.isNotNull(param.getPatientName())){ @@ -201,7 +202,9 @@ public class WisdomCarService implements IWisdomCarService { } ProjectVo.ProjectInfo data = projectId.getData(); + if (ObjectUtil.isNotNull(data)){ + patientProjectId = data.getId(); //将患者与项目绑定 PatientProject patientProject = new PatientProject(); patientProject.setId(patient.getId()); @@ -245,6 +248,7 @@ public class WisdomCarService implements IWisdomCarService { }else{ throw new BaseException(Constant.RETURN_NULL); } + return new WisdomCarVo.PatientProject(patientProjectId); }