手术安排添加“术前访视”和"术前准备完善情况"

src/main/java/thyyxxk/webserver/controller/surgicalmanagement/SurgeryArrangementController.java

@@ -24,8 +24,8 @@ public class SurgeryArrangementController {
         return service.getDicList();
     }
 
-    @PostMapping("/huoQuShouShuAnPaiXinXi")
-    public ResultVo<List<OpRecord>> huoQuShouShuAnPaiXinXi(@RequestBody QuerySurgeryParams param) {
+    @PostMapping("/selectSurgeryArrangements")
+    public ResultVo<List<OpRecord>> selectSurgeryArrangements(@RequestBody QuerySurgeryParams param) {
         return service.selectSurgeryArrangements(param);
     }
 
@@ -42,8 +42,8 @@ public class SurgeryArrangementController {
 
     @GetMapping("/updateArrangement")
     public ResultVo<String> updateArrangement(@RequestParam("recordId") Integer recordId,
-                                              @RequestParam("key") String key,
+                                              @RequestParam("column") String column,
                                               @RequestParam("value") String value) {
-        return service.updateArrangement(recordId, key, value);
+        return service.updateArrangement(recordId, column, value);
     }
 }

src/main/java/thyyxxk/webserver/dao/his/surgicalmanagement/SurgeryArrangementDao.java

@@ -48,7 +48,8 @@ public interface SurgeryArrangementDao {
             "convert(varchar(2), case datediff(dd, c.birth_date, a.op_datetime) " +
             "when 0 then 1 else datediff(dd, c.birth_date, a.op_datetime) end) + '天'  " +
             "else convert(varchar(2), datediff(dd, c.birth_date, a.op_datetime) / 30) + '月' end, " +
-            "a.tw_flag,b.doctor_mz_ys,b.doctor_mz_hs,rtrim(a.ssbc) as ssbc,b.doctor_zd_sj " +
+            "a.tw_flag,b.doctor_mz_ys,b.doctor_mz_hs,rtrim(a.ssbc) as ssbc,b.doctor_zd_sj, " +
+            "a.preoperative_visit,a.preoperative_preparation " +
             "FROM op_record a,op_record_join b,a_patient_mi c " +
             "where a.record_id=b.record_id and a.inpatient_no=c.inpatient_no and " +
             " ${ew.sqlSegment} order by a.urgent_clinic_flag desc, a.room_code")

src/main/java/thyyxxk/webserver/entity/zhuyuanyisheng/shoushu/OpRecord.java

@@ -183,6 +183,17 @@ public class OpRecord implements Serializable {
      * 无菌程度：字典对应
      */
     private String aspesisScale;
+
+    /**
+     * 术前访视
+     * */
+    private String preoperativeVisit;
+
+    /**
+     * 术前准备完善情况
+     * */
+    private String preoperativePreparation;
+
     /**
      * 附注说明，备注
      */

src/main/java/thyyxxk/webserver/service/surgicalmanagement/SurgeryArrangementService.java

@@ -25,6 +25,8 @@ import java.util.Map;
 public class SurgeryArrangementService {
     private final SurgeryArrangementDao dao;
     private final RedisLikeService redis;
+    private static final String[] OP_RECORD_COLUMNS = {"room_code", "op_datetime", "remark",
+            "arrangement_executed", "urgent_clinic_flag", "preoperative_visit", "preoperative_preparation"};
 
     public SurgeryArrangementService(SurgeryArrangementDao dao, RedisLikeService redis) {
         this.dao = dao;
@@ -90,11 +92,19 @@ public class SurgeryArrangementService {
         return ResultVoUtil.fail(ExceptionEnum.INTERNAL_SERVER_ERROR, "操作失败，您没有安排手术的权限。");
     }
 
-    public ResultVo<String> updateArrangement(Integer recordId, String key, String value) {
+    private boolean isOpRecordColumn(String targetColumn) {
+        for (String column : OP_RECORD_COLUMNS) {
+            if (column.equals(targetColumn)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public ResultVo<String> updateArrangement(Integer recordId, String column, String value) {
         if (hasArrangementPermission()) {
-            String table = key.equals("room_code") || key.equals("op_datetime") || key.equals("remark") ||
-                    key.equals("arrangement_executed") ? "op_record" : "op_record_join";
-            dao.updateArrangement(table, key, value, recordId);
+            String table = isOpRecordColumn(column) ? "op_record" : "op_record_join";
+            dao.updateArrangement(table, column, value, recordId);
             return ResultVoUtil.success();
         }
         return ResultVoUtil.fail(ExceptionEnum.INTERNAL_SERVER_ERROR, "操作失败，您没有安排手术的权限。");