From 406dd5864cd5030b75acecb71bc4b4dd719efa91 Mon Sep 17 00:00:00 2001 From: zengwh <81383286@qq.com> Date: Thu, 20 Jan 2022 17:42:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=95=99=E8=A7=82=E7=97=85?= =?UTF-8?q?=E5=8E=86=E5=AE=A1=E6=A0=B8=E3=80=81=E9=80=80=E5=9B=9E=E9=83=BD?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E7=A4=BA=E8=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../emr/controller/lastVerifyController.java | 44 +++++++++---------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/emr/controller/lastVerifyController.java b/src/main/java/com/emr/controller/lastVerifyController.java index a32fa72d..167457ff 100644 --- a/src/main/java/com/emr/controller/lastVerifyController.java +++ b/src/main/java/com/emr/controller/lastVerifyController.java @@ -197,17 +197,16 @@ public class lastVerifyController { archiveMaster.setCmtNurse(1); } bol = archiveMasterService.updateByClo(archiveMaster); - if(!"LG".equals(lgFlag)) { - if (emrFaultDetail.getState().equals("复审退回")) { - //2021-01-30 following表中添加病案室退回操作记录 - archive_master_following.setFollowingType("9"); - archive_master_following.setFollowingContent("病案室退回科主任"); - archive_master_following.setHandleTime(nowTime); - archive_master_following.setHandleId(username); - archive_master_following.setHandleName(handleName); - archive_master_followingService.insertSelective(archive_master_following); - } - }else { + if (emrFaultDetail.getState().equals("复审退回")) { + //2021-01-30 following表中添加病案室退回操作记录 + archive_master_following.setFollowingType("9"); + archive_master_following.setFollowingContent("病案室退回科主任"); + archive_master_following.setHandleTime(nowTime); + archive_master_following.setHandleId(username); + archive_master_following.setHandleName(handleName); + archive_master_followingService.insertSelective(archive_master_following); + } + if("LG".equals(lgFlag)) { //留观号审核推送第三方 archiveMasterService.requestObservationRecord(inpatientNo, "RETURNED", emrFaultDetail.getBackContent()); } @@ -273,20 +272,19 @@ public class lastVerifyController { }else{ emrFaultDetailService.insertSel(emrFaultDetail); }*/ + //初审成功日志 + Archive_Master_Following archiveMasterFollowing = new Archive_Master_Following(); + archiveMasterFollowing.setMasterId(emrFaultDetail.getArchiveDetailId()); + //following表中添加病案室审核操作记录 + archiveMasterFollowing.setFollowingType("8"); + archiveMasterFollowing.setFollowingContent("病案室审核（已归档）"); + archiveMasterFollowing.setHandleTime(nowTime); + archiveMasterFollowing.setHandleId(username); + archiveMasterFollowing.setHandleName(handleName); + archive_master_followingService.insertSelective(archiveMasterFollowing); //获取留观标识，“LG” String lgFlag = inpatientNo.substring(0,2); - if(!"LG".equals(lgFlag)) { - //初审成功日志 - Archive_Master_Following archive_master_following = new Archive_Master_Following(); - archive_master_following.setMasterId(emrFaultDetail.getArchiveDetailId()); - //following表中添加病案室审核操作记录 - archive_master_following.setFollowingType("8"); - archive_master_following.setFollowingContent("病案室审核（已归档）"); - archive_master_following.setHandleTime(nowTime); - archive_master_following.setHandleId(username); - archive_master_following.setHandleName(handleName); - archive_master_followingService.insertSelective(archive_master_following); - }else{ + if("LG".equals(lgFlag)) { //留观号审核推送第三方 archiveMasterService.requestObservationRecord(inpatientNo,"AUDITED",null); }