Merge remote-tracking branch 'origin/master' into master

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);
             }