优化手术安排，添加恢复、已接、未接等功能。

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

@@ -34,9 +34,10 @@ public class SurgeryArrangementController {
         return service.getSurgeryRooms();
     }
 
-    @GetMapping("/cancelSurgery")
-    public ResultVo<String> cancelSurgery(@RequestParam("recordId") Integer recordId) {
-        return service.cancelSurgery(recordId);
+    @GetMapping("/updateSurgeryStatus")
+    public ResultVo<String> updateSurgeryStatus(@RequestParam("recordId") Integer recordId,
+                                                @RequestParam("status") String status) {
+        return service.updateSurgeryStatus(recordId, status);
     }
 
     @GetMapping("/updateArrangement")

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

@@ -33,7 +33,7 @@ public interface SurgeryArrangementDao {
             "a.diag_after_code,a.hbsag,a.body_code,a.part_code,a.specialreq_code,a.instrument_code,a.aspesis_scale, " +
             "a.remark,a.op_dept,a.input_id,a.input_date,a.req_id,a.req_date,a.last_modify_id,a.arrange_id, " +
             "a.arrange_date,a.inpatient_no,a.admiss_times,a.cancel_id,a.cancel_time,b.doctor_zd,b.doctor_mz, " +
-            "b.doctor_1,b.doctor_2,b.nurse_xh,b.nurse_qx,a.bed_no," +
+            "b.doctor_1,b.doctor_2,b.nurse_xh,b.nurse_qx,a.bed_no,a.arrangement_executed, " +
             "chargeSum=(select sum(d.charge_amount) from zy_detail_charge d where " +
             "d.inpatient_no=a.inpatient_no and d.ss_code=a.record_id), " +
             "sex=case when c.sex='1' then '男' else '女' end, " +
@@ -53,8 +53,8 @@ public interface SurgeryArrangementDao {
             " ${ew.sqlSegment} order by a.room_code")
     List<OpRecord> huoQuShouShuAnPaiXinXi(@Param(Constants.WRAPPER) QueryWrapper<?> queryWrapper);
 
-    @Update("update op_record set status='d' where record_id=#{recordId}")
-    void cancelSurgery(Integer recordId);
+    @Update("update op_record set status=#{status} where record_id=#{recordId}")
+    void updateSurgeryStatus(Integer recordId, String status);
 
     @Update("update ${table} set ${column}=#{value} where record_id=#{id}")
     void updateArrangement(String table, String column, String value, Integer id);

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

@@ -360,6 +360,11 @@ public class OpRecord implements Serializable {
      * */
     private Integer chargeSum;
 
+    /**
+     * 0-未接，1-已接
+     * */
+    private Integer arrangementExecuted;
+
     public String getStatusName() {
         if (this.status == null) {
             return "";

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

@@ -74,17 +74,17 @@ public class SurgeryArrangementService {
         return ResultVoUtil.success(dao.selectSurgeryRooms());
     }
 
-    public ResultVo<String> cancelSurgery(Integer recordId) {
+    public ResultVo<String> updateSurgeryStatus(Integer recordId, String status) {
         if (hasArrangementPermission()) {
-            dao.cancelSurgery(recordId);
+            dao.updateSurgeryStatus(recordId, status);
             return ResultVoUtil.success("操作成功。");
         }
-        return ResultVoUtil.fail(ExceptionEnum.INTERNAL_SERVER_ERROR, "操作失败，您没有取消手术的权限。");
+        return ResultVoUtil.fail(ExceptionEnum.INTERNAL_SERVER_ERROR, "操作失败，您没有安排手术的权限。");
     }
 
     public ResultVo<String> updateArrangement(Integer recordId, String key, String value) {
         if (hasArrangementPermission()) {
-            String table = key.equals("room_code") ? "op_record" : "op_record_join";
+            String table = key.equals("room_code") || key.equals("arrangement_executed") ? "op_record" : "op_record_join";
             dao.updateArrangement(table, key, value, recordId);
             return ResultVoUtil.success();
         }