From 37022a5aa114261dcb9e4f312b07c6e029f59e24 Mon Sep 17 00:00:00 2001 From: fhx <308050795@qq.com> Date: 星期五, 08 十二月 2023 11:28:27 +0800 Subject: [PATCH] 1.治疗单新增字段 --- phi_platform_user/src/main/java/com/hx/phip/controller/treat/TreatController.java | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/phi_platform_user/src/main/java/com/hx/phip/controller/treat/TreatController.java b/phi_platform_user/src/main/java/com/hx/phip/controller/treat/TreatController.java index 35b4790..87db2a7 100644 --- a/phi_platform_user/src/main/java/com/hx/phip/controller/treat/TreatController.java +++ b/phi_platform_user/src/main/java/com/hx/phip/controller/treat/TreatController.java @@ -121,6 +121,8 @@ treatSingle.setUserId(visitOrder.getUserId()); + + treatV3Service.add(treatSingle, projectList, visitOrder, employeeRole, isMicNotice, signList); //杩斿洖id @@ -285,7 +287,7 @@ throw new PlatTipsException(PlatformCode.ERROR_PARAMETER_NULL, "鏌ヨ涓嶅埌娌荤枟閫氱煡鍗曚俊鎭紒"); } - checkSignParam(reqVo.getSignList()); + checkSignParam(reqVo.getSignList(), treatSingle); treatV3Service.updateSign(treatSingle, reqVo.getSignList(), employeeRole); @@ -577,14 +579,15 @@ //鏍¢獙绛惧悕鍙傛暟---------------------------------------------------------------------------------- if(signList != null && signList.size() > 0){ - checkSignParam(signList); + checkSignParam(signList, treatSingle); } //---------------------------------------------------------------------------------- } /** 妫�娴嬫牎楠屾不鐤楀崟绛惧悕鍙傛暟 */ - private void checkSignParam(List<TreatSingleSign> signList){ + private void checkSignParam(List<TreatSingleSign> signList, TreatSingle treatSingle){ + treatSingle.setIsUserSign(BaseEntity.NO); for(TreatSingleSign sign : signList){ if(StringUtils.isEmpty(sign.getSignImg())){ throw new PlatTipsException(PlatformCode.ERROR_PARAMETER_NULL,"绛惧悕鍥剧墖涓嶈兘涓虹┖锛�"); @@ -599,6 +602,7 @@ //鍒ゆ柇绫诲瀷锛屾洿鏀瑰搴斿�� if(TreatSingleSign.SIGN_PER_TYPE_USER.equals(sign.getSignPerType())){ sign.setSortNo(1); + treatSingle.setIsUserSign(BaseEntity.YES); }else if(TreatSingleSign.SIGN_PER_TYPE_NURSE1.equals(sign.getSignPerType())){ sign.setSortNo(2); }else if(TreatSingleSign.SIGN_PER_TYPE_NURSE2.equals(sign.getSignPerType())){ -- Gitblit v1.8.0