Browse Source

病案表添加签收人

lighter 1 year ago
parent
commit
349fd96a4f

+ 1 - 1
pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>thyyxxk</groupId>
     <artifactId>web-server</artifactId>
-    <version>11.7.9</version>
+    <version>11.8.1</version>
     <name>web-server</name>
     <description>server for yibao-web</description>
     <properties>

+ 4 - 2
src/main/java/thyyxxk/webserver/dao/his/inpatient/casefrontsheet/CaseFrontSheetDao.java

@@ -455,9 +455,11 @@ public interface CaseFrontSheetDao extends BaseMapper<CaseFrontsheetMain> {
             "#{assistantTwo},#{cut},#{heal},#{anaesthesia},#{anaesthesiaor},#{date},#{opEndDate},#{anstStartDate},#{anstEndDate})")
     void writeNewZySurgeryRecord(CaseFrontsheetSurgery surgery);
 
-    @Update("update t_case_frontsheet_main set file_status=1, sign_date=getdate(), late_flag=#{late} " +
+    @Update("update t_case_frontsheet_main set file_status=1, sign_date=getdate(), " +
+            "late_flag=#{late},sign_staff=#{staff} " +
             "where bah=#{bah} and admiss_times=#{times}")
-    void updateSignStatus(@Param("bah") String bah, @Param("times") int times, @Param("late") int late);
+    void updateSignStatus(@Param("bah") String bah, @Param("times") int times,
+                          @Param("late") int late, @Param("staff") String staff);
 
     @Insert("insert into ba_op_log (op_type, op_id, op_time, inpatient_no, admiss_times) values " +
             "(#{opType}, #{staffId}, getDate(), #{bah}, #{admissTimes})")

+ 5 - 0
src/main/java/thyyxxk/webserver/entity/casefrontsheet/CaseFrontsheetMain.java

@@ -48,6 +48,11 @@ public class CaseFrontsheetMain implements Serializable {
      */
     private Date signDate;
 
+    /**
+     * 签收人
+     * */
+    private String signStaff;
+
     /**
      * 医疗付费方式
      */

+ 2 - 1
src/main/java/thyyxxk/webserver/service/inpatient/casefrontsheet/CaseFrontSheetMainService.java

@@ -587,6 +587,7 @@ public class CaseFrontSheetMainService {
             sheet.setLateFlag(lateFlag);
             //插入数据 SignDate 签收日期  在点击签收后 向数据库中插入
             sheet.setSignDate(new Date());
+            sheet.setSignStaff(staff);
             sheet.setFileStatus(1);
             //判断是否已经插入过了
             Integer fileStatus = dao.selectFileStatus(sheet.getBah(), sheet.getAdmissTimes());
@@ -598,7 +599,7 @@ public class CaseFrontSheetMainService {
             if (fileStatus == 1) {
                 return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "请勿重复签收 ( ˉ ⌓ ˉ ๑)");
             }
-            dao.updateSignStatus(bah, times, lateFlag);
+            dao.updateSignStatus(bah, times, lateFlag, staff);
             basDao.updateActFileStatus(bah, times, 1);
             return ResultVoUtil.success();
         }