From 51b44b3c9278ce5aa970db2b04f23856bd364305 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 21 二月 2025 18:21:22 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/java/com/smartor/domain/PatMedOperation.java                                 |  381 +++++++++-
 smartor/src/main/java/com/smartor/service/impl/PatMedOperationItemServiceImpl.java            |   96 ++
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOperationItemController.java |  113 +++
 smartor/src/main/java/com/smartor/service/IPatMedOperationItemService.java                    |   61 +
 smartor/src/main/java/com/smartor/domain/PatMedOperationItem.java                             |  110 +++
 smartor/src/main/java/com/smartor/service/IPatMedOperationService.java                        |   21 
 smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java                |    1 
 smartor/src/main/resources/mapper/smartor/PatMedOperationMapper.xml                           |  829 ++++++++++++++++++++---
 smartor/src/main/java/com/smartor/mapper/PatMedOperationItemMapper.java                       |   63 +
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOperationController.java     |   62 
 smartor/src/main/resources/mapper/smartor/PatMedOperationItemMapper.xml                       |  275 +++++++
 smartor/src/main/java/com/smartor/mapper/PatMedOperationMapper.java                           |    5 
 ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.java  |    8 
 smartor/src/main/java/com/smartor/service/impl/PatMedOperationServiceImpl.java                |   20 
 14 files changed, 1,827 insertions(+), 218 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOperationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOperationController.java
index fa30e22..fb77ac6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOperationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOperationController.java
@@ -1,41 +1,32 @@
 package com.ruoyi.web.controller.smartor;
 
-import java.util.List;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.smartor.domain.PatMedOperation;
 import com.smartor.service.IPatMedOperationService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 鎮h�呮墜鏈褰旵ontroller
  *
  * @author lihu
- * @date 2024-08-05
+ * @date 2025-02-21
  */
 @Api("鎮h�呮墜鏈褰�")
 @RestController
 @RequestMapping("/smartor/operation")
-public class PatMedOperationController extends BaseController {
+public class PatMedOperationController extends BaseController
+{
     @Autowired
     private IPatMedOperationService patMedOperationService;
 
@@ -45,7 +36,8 @@
     @ApiOperation("鏌ヨ鎮h�呮墜鏈褰曞垪琛�")
     //@PreAuthorize("@ss.hasPermi('smartor:operation:list')")
     @GetMapping("/list")
-    public TableDataInfo list(PatMedOperation patMedOperation) {
+    public TableDataInfo list(PatMedOperation patMedOperation)
+    {
         startPage();
         List<PatMedOperation> list = patMedOperationService.selectPatMedOperationList(patMedOperation);
         return getDataTable(list);
@@ -56,9 +48,10 @@
      */
     @ApiOperation("瀵煎嚭鎮h�呮墜鏈褰曞垪琛�")
     //@PreAuthorize("@ss.hasPermi('smartor:operation:export')")
-    @Log(title = "鎮h�呮墜鏈褰�" , businessType = BusinessType.EXPORT)
+    @Log(title = "鎮h�呮墜鏈褰�", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, PatMedOperation patMedOperation) {
+    public void export(HttpServletResponse response, PatMedOperation patMedOperation)
+    {
         List<PatMedOperation> list = patMedOperationService.selectPatMedOperationList(patMedOperation);
         ExcelUtil<PatMedOperation> util = new ExcelUtil<PatMedOperation>(PatMedOperation.class);
         util.exportExcel(response, list, "鎮h�呮墜鏈褰曟暟鎹�");
@@ -70,17 +63,20 @@
     @ApiOperation("鑾峰彇鎮h�呮墜鏈褰曡缁嗕俊鎭�")
     //@PreAuthorize("@ss.hasPermi('smartor:operation:query')")
     @GetMapping(value = "/getInfo/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id) {
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
         return success(patMedOperationService.selectPatMedOperationById(id));
     }
 
     /**
      * 鏂板鎮h�呮墜鏈褰�
      */
+    @ApiOperation("鏂板鎮h�呮墜鏈褰�")
     //@PreAuthorize("@ss.hasPermi('smartor:operation:add')")
-    @Log(title = "鎮h�呮墜鏈褰�" , businessType = BusinessType.INSERT)
+    @Log(title = "鎮h�呮墜鏈褰�", businessType = BusinessType.INSERT)
     @PostMapping("/add")
-    public AjaxResult add(@RequestBody PatMedOperation patMedOperation) {
+    public AjaxResult add(@RequestBody PatMedOperation patMedOperation)
+    {
         return toAjax(patMedOperationService.insertPatMedOperation(patMedOperation));
     }
 
@@ -89,9 +85,10 @@
      */
     @ApiOperation("淇敼鎮h�呮墜鏈褰�")
     //@PreAuthorize("@ss.hasPermi('smartor:operation:edit')")
-    @Log(title = "鎮h�呮墜鏈褰�" , businessType = BusinessType.UPDATE)
+    @Log(title = "鎮h�呮墜鏈褰�", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
-    public AjaxResult edit(@RequestBody PatMedOperation patMedOperation) {
+    public AjaxResult edit(@RequestBody PatMedOperation patMedOperation)
+    {
         return toAjax(patMedOperationService.updatePatMedOperation(patMedOperation));
     }
 
@@ -100,9 +97,10 @@
      */
     @ApiOperation("鍒犻櫎鎮h�呮墜鏈褰�")
     //@PreAuthorize("@ss.hasPermi('smartor:operation:remove')")
-    @Log(title = "鎮h�呮墜鏈褰�" , businessType = BusinessType.DELETE)
-    @GetMapping("/remove/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids) {
+    @Log(title = "鎮h�呮墜鏈褰�", businessType = BusinessType.DELETE)
+	@GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
         return toAjax(patMedOperationService.deletePatMedOperationByIds(ids));
     }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOperationItemController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOperationItemController.java
new file mode 100644
index 0000000..792425b
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatMedOperationItemController.java
@@ -0,0 +1,113 @@
+package com.ruoyi.web.controller.smartor;
+
+import java.util.List;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.smartor.domain.PatMedOperationItem;
+import com.smartor.service.IPatMedOperationItemService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 鎮h�呮鏌ユ楠岃褰曞瓙Controller
+ *
+ * @author lihu
+ * @date 2025-02-21
+ */
+@Api("鎮h�呮鏌ユ楠岃褰曞瓙")
+@RestController
+@RequestMapping("/smartor/item")
+public class PatMedOperationItemController extends BaseController
+{
+    @Autowired
+    private IPatMedOperationItemService patMedOperationItemService;
+
+    /**
+     * 鏌ヨ鎮h�呮鏌ユ楠岃褰曞瓙鍒楄〃
+     */
+    @ApiOperation("鏌ヨ鎮h�呮鏌ユ楠岃褰曞瓙鍒楄〃")
+    //@PreAuthorize("@ss.hasPermi('smartor:item:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(PatMedOperationItem patMedOperationItem)
+    {
+        startPage();
+        List<PatMedOperationItem> list = patMedOperationItemService.selectPatMedOperationItemList(patMedOperationItem);
+        return getDataTable(list);
+    }
+
+    /**
+     * 瀵煎嚭鎮h�呮鏌ユ楠岃褰曞瓙鍒楄〃
+     */
+    @ApiOperation("瀵煎嚭鎮h�呮鏌ユ楠岃褰曞瓙鍒楄〃")
+    //@PreAuthorize("@ss.hasPermi('smartor:item:export')")
+    @Log(title = "鎮h�呮鏌ユ楠岃褰曞瓙", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, PatMedOperationItem patMedOperationItem)
+    {
+        List<PatMedOperationItem> list = patMedOperationItemService.selectPatMedOperationItemList(patMedOperationItem);
+        ExcelUtil<PatMedOperationItem> util = new ExcelUtil<PatMedOperationItem>(PatMedOperationItem.class);
+        util.exportExcel(response, list, "鎮h�呮鏌ユ楠岃褰曞瓙鏁版嵁");
+    }
+
+    /**
+     * 鑾峰彇鎮h�呮鏌ユ楠岃褰曞瓙璇︾粏淇℃伅
+     */
+    @ApiOperation("鑾峰彇鎮h�呮鏌ユ楠岃褰曞瓙璇︾粏淇℃伅")
+    //@PreAuthorize("@ss.hasPermi('smartor:item:query')")
+    @GetMapping(value = "/getInfo/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(patMedOperationItemService.selectPatMedOperationItemById(id));
+    }
+
+    /**
+     * 鏂板鎮h�呮鏌ユ楠岃褰曞瓙
+     */
+    @ApiOperation("鏂板鎮h�呮鏌ユ楠岃褰曞瓙")
+    //@PreAuthorize("@ss.hasPermi('smartor:item:add')")
+    @Log(title = "鎮h�呮鏌ユ楠岃褰曞瓙", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody PatMedOperationItem patMedOperationItem)
+    {
+        return toAjax(patMedOperationItemService.insertPatMedOperationItem(patMedOperationItem));
+    }
+
+    /**
+     * 淇敼鎮h�呮鏌ユ楠岃褰曞瓙
+     */
+    @ApiOperation("淇敼鎮h�呮鏌ユ楠岃褰曞瓙")
+    //@PreAuthorize("@ss.hasPermi('smartor:item:edit')")
+    @Log(title = "鎮h�呮鏌ユ楠岃褰曞瓙", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody PatMedOperationItem patMedOperationItem)
+    {
+        return toAjax(patMedOperationItemService.updatePatMedOperationItem(patMedOperationItem));
+    }
+
+    /**
+     * 鍒犻櫎鎮h�呮鏌ユ楠岃褰曞瓙
+     */
+    @ApiOperation("鍒犻櫎鎮h�呮鏌ユ楠岃褰曞瓙")
+    //@PreAuthorize("@ss.hasPermi('smartor:item:remove')")
+    @Log(title = "鎮h�呮鏌ユ楠岃褰曞瓙", businessType = BusinessType.DELETE)
+	@GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(patMedOperationItemService.deletePatMedOperationItemByIds(ids));
+    }
+}
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.java
index 3dd9da6..7c9bc0c 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.java
@@ -72,7 +72,13 @@
      * @return 淇敼鍚庣殑 SQL
      */
     private String modifySqlWithorgidId(String originalSql, String orgid) {
-        if (originalSql.contains("insert into") || originalSql.contains("INSERT INTO") || originalSql.contains("from sys_menu") || originalSql.contains("update sys_menu")) {
+        if (originalSql.contains("insert into")
+                || originalSql.contains("INSERT INTO")
+                || originalSql.contains("from sys_menu")
+                || originalSql.contains("update sys_menu")
+                || originalSql.contains("information_schema.tables")
+                || originalSql.contains("information_schema.columns")
+                || originalSql.contains("gen_table")) {
             return originalSql;
         }
         // 鎻愬彇 orgid 鐨� WHERE 瀛愬彞
diff --git a/smartor/src/main/java/com/smartor/domain/PatMedOperation.java b/smartor/src/main/java/com/smartor/domain/PatMedOperation.java
index 7098106..f432488 100644
--- a/smartor/src/main/java/com/smartor/domain/PatMedOperation.java
+++ b/smartor/src/main/java/com/smartor/domain/PatMedOperation.java
@@ -13,7 +13,7 @@
  * 鎮h�呮墜鏈褰曞璞� pat_med_operation
  *
  * @author lihu
- * @date 2024-08-05
+ * @date 2025-02-21
  */
 @Data
 @ApiModel("鎮h�呮墜鏈褰�")
@@ -24,28 +24,51 @@
      * 鑷ID
      */
     @ApiModelProperty("鑷ID")
+    //鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
     private Long id;
 
     /**
-     * 灏辫瘖娴佹按鍙�
+     * 鐥呬汉ID
      */
-    @ApiModelProperty("灏辫瘖娴佹按鍙�")
-    @Excel(name = "灏辫瘖娴佹按鍙�")
-    private String serialnum;
-
-    /**
-     * 妗fID
-     */
-    @ApiModelProperty("妗fID")
-    @Excel(name = "妗fID")
+    @ApiModelProperty("鐥呬汉ID")
+    @Excel(name = "鐥呬汉ID")
     private Long patid;
 
     /**
-     * 鎵嬫湳鍚嶇О
+     * 鐥呬汉缂栧彿
      */
-    @ApiModelProperty("鎵嬫湳鍚嶇О")
-    @Excel(name = "鎵嬫湳鍚嶇О")
-    private String operationname;
+    @ApiModelProperty("鐥呬汉缂栧彿")
+    @Excel(name = "鐥呬汉缂栧彿")
+    private String patcode;
+
+    /**
+     * 鐥呬汉濮撳悕
+     */
+    @ApiModelProperty("鐥呬汉濮撳悕")
+    @Excel(name = "鐥呬汉濮撳悕")
+    private String paname;
+
+    /**
+     * 鎵嬫湳鐢宠鍗旾D
+     */
+    @ApiModelProperty("鎵嬫湳鐢宠鍗旾D")
+    @Excel(name = "鎵嬫湳鐢宠鍗旾D")
+    private Long opreqid;
+
+    /**
+     * 鎵嬫湳鐢宠鍗曞彿
+     */
+    @ApiModelProperty("鎵嬫湳鐢宠鍗曞彿")
+    @Excel(name = "鎵嬫湳鐢宠鍗曞彿")
+    private String opreqcode;
+
+    /**
+     * 鎵嬫湳鐘舵�侊細N锛嶇敵璇稲锛嶅畨鎺扗锛嶆嫆缁�
+     * C锛嶅彇娑� F锛嶇粨鏉�
+     */
+    @ApiModelProperty("鎵嬫湳鐘舵�侊細N锛嶇敵璇稲锛嶅畨鎺扗锛嶆嫆缁� C锛嶅彇娑� F锛嶇粨鏉�")
+    @Excel(name = "鎵嬫湳鐘舵�侊細N锛嶇敵璇稲锛嶅畨鎺扗锛嶆嫆缁� C锛嶅彇娑� F锛嶇粨鏉�")
+    private String opsstatus;
 
     /**
      * 鎵嬫湳浠g爜
@@ -55,26 +78,153 @@
     private String operationcode;
 
     /**
-     * 鎵嬫湳ID
+     * 鎵嬫湳鍚嶇О
      */
-    @ApiModelProperty("鎵嬫湳ID")
-    @Excel(name = "鎵嬫湳ID")
-    private Long operationid;
+    @ApiModelProperty("鎵嬫湳鍚嶇О")
+    @Excel(name = "鎵嬫湳鍚嶇О")
+    private String operationname;
 
     /**
-     * 鎵嬫湳鏃堕棿
+     * 瑕佹眰鎵嬫湳鏃堕棿
      */
-    @ApiModelProperty("鎵嬫湳鏃堕棿")
+    @ApiModelProperty("瑕佹眰鎵嬫湳鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "鎵嬫湳鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date operationtime;
+    @Excel(name = "瑕佹眰鎵嬫湳鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date operatortime;
 
     /**
-     * 灏辫瘖ID
+     * 鎵嬫湳鐢宠鏃堕棿
      */
-    @ApiModelProperty("灏辫瘖ID")
-    @Excel(name = "灏辫瘖ID")
-    private Long visitid;
+    @ApiModelProperty("鎵嬫湳鐢宠鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "鎵嬫湳鐢宠鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date opreqtime;
+
+    /**
+     * 鐢宠鍖荤敓缂栧彿
+     */
+    @ApiModelProperty("鐢宠鍖荤敓缂栧彿")
+    @Excel(name = "鐢宠鍖荤敓缂栧彿")
+    private String reqdoccode;
+
+    /**
+     * 鐢宠鍖荤敓濮撳悕
+     */
+    @ApiModelProperty("鐢宠鍖荤敓濮撳悕")
+    @Excel(name = "鐢宠鍖荤敓濮撳悕")
+    private String reqdocname;
+
+    /**
+     * 鐢宠绉戝缂栧彿
+     */
+    @ApiModelProperty("鐢宠绉戝缂栧彿")
+    @Excel(name = "鐢宠绉戝缂栧彿")
+    private String reqdeptcode;
+
+    /**
+     * 鐢宠绉戝鍚嶇О
+     */
+    @ApiModelProperty("鐢宠绉戝鍚嶇О")
+    @Excel(name = "鐢宠绉戝鍚嶇О")
+    private String reqdeptname;
+
+    /**
+     * 鎵嬫湳绉戝缂栧彿
+     */
+    @ApiModelProperty("鎵嬫湳绉戝缂栧彿")
+    @Excel(name = "鎵嬫湳绉戝缂栧彿")
+    private String reqloccode;
+
+    /**
+     * 鎵嬫湳绉戝鍚嶇О
+     */
+    @ApiModelProperty("鎵嬫湳绉戝鍚嶇О")
+    @Excel(name = "鎵嬫湳绉戝鍚嶇О")
+    private String reqlocname;
+
+    /**
+     * 涓诲垁鍖荤敓缂栧彿
+     */
+    @ApiModelProperty("涓诲垁鍖荤敓缂栧彿")
+    @Excel(name = "涓诲垁鍖荤敓缂栧彿")
+    private String surgeoncode;
+
+    /**
+     * 涓诲垁鍖荤敓濮撳悕
+     */
+    @ApiModelProperty("涓诲垁鍖荤敓濮撳悕")
+    @Excel(name = "涓诲垁鍖荤敓濮撳悕")
+    private String surgeonname;
+
+    /**
+     * 涓�鍔╁尰鐢熺紪鍙�
+     */
+    @ApiModelProperty("涓�鍔╁尰鐢熺紪鍙�")
+    @Excel(name = "涓�鍔╁尰鐢熺紪鍙�")
+    private String firasscode;
+
+    /**
+     * 涓�鍔╁尰鐢熷鍚�
+     */
+    @ApiModelProperty("涓�鍔╁尰鐢熷鍚�")
+    @Excel(name = "涓�鍔╁尰鐢熷鍚�")
+    private String firassname;
+
+    /**
+     * 浜屽姪鍖荤敓缂栧彿
+     */
+    @ApiModelProperty("浜屽姪鍖荤敓缂栧彿")
+    @Excel(name = "浜屽姪鍖荤敓缂栧彿")
+    private String secasscode;
+
+    /**
+     * 浜屽姪鍖荤敓濮撳悕
+     */
+    @ApiModelProperty("浜屽姪鍖荤敓濮撳悕")
+    @Excel(name = "浜屽姪鍖荤敓濮撳悕")
+    private String secassname;
+
+    /**
+     * 涓夊姪鍖荤敓缂栧彿
+     */
+    @ApiModelProperty("涓夊姪鍖荤敓缂栧彿")
+    @Excel(name = "涓夊姪鍖荤敓缂栧彿")
+    private String thrasscode;
+
+    /**
+     * 涓夊姪鍖荤敓濮撳悕
+     */
+    @ApiModelProperty("涓夊姪鍖荤敓濮撳悕")
+    @Excel(name = "涓夊姪鍖荤敓濮撳悕")
+    private String thrassname;
+
+    /**
+     * 浣滃簾鏃堕棿
+     */
+    @ApiModelProperty("浣滃簾鏃堕棿")
+    @Excel(name = "浣滃簾鏃堕棿")
+    private String canceltime;
+
+    /**
+     * 浣滃簾鍘熷洜
+     */
+    @ApiModelProperty("浣滃簾鍘熷洜")
+    @Excel(name = "浣滃簾鍘熷洜")
+    private String cancelreason;
+
+    /**
+     * 浣滃簾鐢宠浜虹紪鍙�
+     */
+    @ApiModelProperty("浣滃簾鐢宠浜虹紪鍙�")
+    @Excel(name = "浣滃簾鐢宠浜虹紪鍙�")
+    private String cancelcode;
+
+    /**
+     * 浣滃簾鐢宠浜哄鍚�
+     */
+    @ApiModelProperty("浣滃簾鐢宠浜哄鍚�")
+    @Excel(name = "浣滃簾鐢宠浜哄鍚�")
+    private String cancelname;
 
     /**
      * 灏辫瘖绫诲瀷;1闂ㄨ瘖 2浣忛櫌 3浣撴
@@ -84,18 +234,19 @@
     private Long visittype;
 
     /**
-     * 鎵嬫湳鐘舵��;0鏈紑濮� 1宸插畬鎴�
+     * 鎵嬫湳鐘舵�侊細N锛嶇敵璇稲锛嶅畨鎺扗锛嶆嫆缁�
+     * C锛嶅彇娑� F锛嶇粨鏉�
      */
-    @ApiModelProperty("鎵嬫湳鐘舵��;0鏈紑濮� 1宸插畬鎴�")
-    @Excel(name = "鎵嬫湳鐘舵��;0鏈紑濮� 1宸插畬鎴�")
-    private Long status;
+    @ApiModelProperty("鎵嬫湳鐘舵�侊細N锛嶇敵璇稲锛嶅畨鎺扗锛嶆嫆缁� C锛嶅彇娑� F锛嶇粨鏉�")
+    @Excel(name = "鎵嬫湳鐘舵�侊細N锛嶇敵璇稲锛嶅畨鎺扗锛嶆嫆缁� C锛嶅彇娑� F锛嶇粨鏉�")
+    private String status;
 
     /**
      * 鏂规鐘舵�佹搷浣滄椂闂�
      */
     @ApiModelProperty("鏂规鐘舵�佹搷浣滄椂闂�")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "鏂规鐘舵�佹搷浣滄椂闂�" , width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "鏂规鐘舵�佹搷浣滄椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date schemetime;
 
     /**
@@ -104,13 +255,6 @@
     @ApiModelProperty("鏄惁鐢熸垚璁″垝;0鏈敓鎴� 1鐢熸垚鎵嬫湳鍓� 2鐢熸垚鎵嬫湳鍚�  9鏃犲尮閰嶆柟妗�")
     @Excel(name = "鏄惁鐢熸垚璁″垝;0鏈敓鎴� 1鐢熸垚鎵嬫湳鍓� 2鐢熸垚鎵嬫湳鍚�  9鏃犲尮閰嶆柟妗�")
     private Long schemestatus;
-
-    /**
-     * 鏈烘瀯ID
-     */
-    @ApiModelProperty("鏈烘瀯ID")
-    @Excel(name = "鏈烘瀯ID")
-    private String orgid;
 
     /**
      * 鍒犻櫎鏍囧織锛�0锛氭湭鍒犻櫎 1锛氬凡鍒犻櫎锛�
@@ -122,7 +266,7 @@
      * 涓婁紶鏍囧織锛�0锛氭湭涓婁紶 1锛氬凡涓婁紶锛�
      */
     @ApiModelProperty("涓婁紶鏍囧織锛�0锛氭湭涓婁紶 1锛氬凡涓婁紶锛�")
-    @Excel(name = "涓婁紶鏍囧織" , readConverterExp = "0=锛氭湭涓婁紶,1=锛氬凡涓婁紶")
+    @Excel(name = "涓婁紶鏍囧織", readConverterExp = "0=锛氭湭涓婁紶,1=锛氬凡涓婁紶")
     private Long isupload;
 
     /**
@@ -130,8 +274,29 @@
      */
     @ApiModelProperty("涓婁紶鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "涓婁紶鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "涓婁紶鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date uploadTime;
+
+    /**
+     * 鍖婚櫌鏈烘瀯ID
+     */
+    @ApiModelProperty("鍖婚櫌鏈烘瀯ID")
+    @Excel(name = "鍖婚櫌鏈烘瀯ID")
+    private String orgid;
+
+    /**
+     * GUID
+     */
+    @ApiModelProperty("GUID")
+    @Excel(name = "GUID")
+    private String guid;
+
+    /**
+     * 鐖禛UID
+     */
+    @ApiModelProperty("鐖禛UID")
+    @Excel(name = "鐖禛UID")
+    private String pguid;
 
     /**
      * 鐖禝D
@@ -141,11 +306,137 @@
     private Long pid;
 
     /**
-     * GUID
+     * 灏辫瘖绫诲瀷鏍囪瘑锛�0锛氬湪闄� 1锛氬嚭闄� 2锛氳浆绉�
      */
-    @ApiModelProperty("GUID")
-    @Excel(name = "GUID")
-    private String guid;
+    @ApiModelProperty("灏辫瘖绫诲瀷鏍囪瘑锛�0锛氬湪闄� 1锛氬嚭闄� 2锛氳浆绉�")
+    @Excel(name = "灏辫瘖绫诲瀷鏍囪瘑锛�0锛氬湪闄� 1锛氬嚭闄� 2锛氳浆绉�")
+    private String inhospstate;
+
+    /**
+     * 鎮h�呮。妗堢紪鍙�
+     */
+    @ApiModelProperty("鎮h�呮。妗堢紪鍙�")
+    @Excel(name = "鎮h�呮。妗堢紪鍙�")
+    private String patno;
+
+    /**
+     * 鐥呬汉濮撳悕
+     */
+    @ApiModelProperty("鐥呬汉濮撳悕")
+    @Excel(name = "鐥呬汉濮撳悕")
+    private String patname;
+
+    /**
+     * 闂ㄨ瘖灏辫瘖ID
+     */
+    @ApiModelProperty("闂ㄨ瘖灏辫瘖ID")
+    @Excel(name = "闂ㄨ瘖灏辫瘖ID")
+    private Long visitid;
+
+    /**
+     * 灏辫瘖娴佹按鍙�
+     */
+    @ApiModelProperty("灏辫瘖娴佹按鍙�")
+    @Excel(name = "灏辫瘖娴佹按鍙�")
+    private String serialnum;
+
+    /**
+     * 浣忛櫌鍙�
+     */
+    @ApiModelProperty("浣忛櫌鍙�")
+    @Excel(name = "浣忛櫌鍙�")
+    private String inhospno;
+
+    /**
+     * 鍖婚櫌鍚嶇О
+     */
+    @ApiModelProperty("鍖婚櫌鍚嶇О")
+    @Excel(name = "鍖婚櫌鍚嶇О")
+    private String hospitalname;
+
+    /**
+     * 鍖婚櫌缂栧彿
+     */
+    @ApiModelProperty("鍖婚櫌缂栧彿")
+    @Excel(name = "鍖婚櫌缂栧彿")
+    private String hospitalcode;
+
+    /**
+     * 灏辫瘖绉戝ID
+     */
+    @ApiModelProperty("灏辫瘖绉戝ID")
+    @Excel(name = "灏辫瘖绉戝ID")
+    private String deptid;
+
+    /**
+     * 绉戝浠g爜
+     */
+    @ApiModelProperty("绉戝浠g爜")
+    @Excel(name = "绉戝浠g爜")
+    private String deptcode;
+
+    /**
+     * 绉戝鍚嶇О
+     */
+    @ApiModelProperty("绉戝鍚嶇О")
+    @Excel(name = "绉戝鍚嶇О")
+    private String deptname;
+
+    /**
+     * 鐥呭尯缂栧彿
+     */
+    @ApiModelProperty("鐥呭尯缂栧彿")
+    @Excel(name = "鐥呭尯缂栧彿")
+    private String hospitaldistrictcode;
+
+    /**
+     * 鐥呭尯鍚嶇О
+     */
+    @ApiModelProperty("鐥呭尯鍚嶇О")
+    @Excel(name = "鐥呭尯鍚嶇О")
+    private String hospitaldistrictname;
+
+    /**
+     * 鎴块棿鍙�
+     */
+    @ApiModelProperty("鎴块棿鍙�")
+    @Excel(name = "鎴块棿鍙�")
+    private String roomno;
+
+    /**
+     * 搴婁綅鍙�
+     */
+    @ApiModelProperty("搴婁綅鍙�")
+    @Excel(name = "搴婁綅鍙�")
+    private String bedNo;
+
+    /**
+     * 涓绘不鍖荤敓宸ュ彿
+     */
+    @ApiModelProperty("涓绘不鍖荤敓宸ュ彿")
+    @Excel(name = "涓绘不鍖荤敓宸ュ彿")
+    private String drcode;
+
+    /**
+     * 涓绘不鍖荤敓鍚嶇О
+     */
+    @ApiModelProperty("涓绘不鍖荤敓鍚嶇О")
+    @Excel(name = "涓绘不鍖荤敓鍚嶇О")
+    private String drname;
+
+    /**
+     * 鎶ゅ+ID
+     */
+    @ApiModelProperty("鎶ゅ+ID")
+    @Excel(name = "鎶ゅ+ID")
+    private String nurseId;
+
+    /**
+     * 鎶ゅ+濮撳悕
+     */
+    @ApiModelProperty("鎶ゅ+濮撳悕")
+    @Excel(name = "鎶ゅ+濮撳悕")
+    private String nurseName;
 
 }
 
diff --git a/smartor/src/main/java/com/smartor/domain/PatMedOperationItem.java b/smartor/src/main/java/com/smartor/domain/PatMedOperationItem.java
new file mode 100644
index 0000000..9b61a28
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/PatMedOperationItem.java
@@ -0,0 +1,110 @@
+package com.smartor.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 鎮h�呮鏌ユ楠岃褰曞瓙瀵硅薄 pat_med_operation_item
+ *
+ * @author lihu
+ * @date 2025-02-21
+ */
+@Data
+@ApiModel("鎮h�呮鏌ユ楠岃褰曞瓙")
+public class PatMedOperationItem extends BaseEntity
+        {
+private static final long serialVersionUID = 1L;
+
+    /** 鑷ID */
+    @ApiModelProperty("鑷ID")
+        //鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
+    private Long id;
+
+    /** 鎵嬫湳涓昏〃id */
+    @ApiModelProperty("鎵嬫湳涓昏〃id")
+            @Excel(name = "鎵嬫湳涓昏〃id")
+    private Long opid;
+
+    /** 鎵嬫湳鍚嶇ОID */
+    @ApiModelProperty("鎵嬫湳鍚嶇ОID")
+            @Excel(name = "鎵嬫湳鍚嶇ОID")
+    private String opcode;
+
+    /** 鎵嬫湳鍚嶇О */
+    @ApiModelProperty("鎵嬫湳鍚嶇О")
+            @Excel(name = "鎵嬫湳鍚嶇О")
+    private String opdesc;
+
+    /** 涓绘墜鏈爣璇� */
+    @ApiModelProperty("涓绘墜鏈爣璇�")
+            @Excel(name = "涓绘墜鏈爣璇�")
+    private String mainFlag;
+
+    /** 鍒囧彛绫诲埆浠g爜 */
+    @ApiModelProperty("鍒囧彛绫诲埆浠g爜")
+            @Excel(name = "鍒囧彛绫诲埆浠g爜")
+    private String incitypecode;
+
+    /** 鍒囧彛绫诲埆鍚嶇О */
+    @ApiModelProperty("鍒囧彛绫诲埆鍚嶇О")
+            @Excel(name = "鍒囧彛绫诲埆鍚嶇О")
+    private String incitypedesc;
+
+    /** 鎵嬫湳绾у埆浠g爜 */
+    @ApiModelProperty("鎵嬫湳绾у埆浠g爜")
+            @Excel(name = "鎵嬫湳绾у埆浠g爜")
+    private String oplevelcode;
+
+    /** 鎵嬫湳绾у埆鍚嶇О */
+    @ApiModelProperty("鎵嬫湳绾у埆鍚嶇О")
+            @Excel(name = "鎵嬫湳绾у埆鍚嶇О")
+    private String opleveldesc;
+
+    /** 鎵嬫湳閮ㄤ綅 */
+    @ApiModelProperty("鎵嬫湳閮ㄤ綅")
+            @Excel(name = "鎵嬫湳閮ㄤ綅")
+    private String opposition;
+
+    /** 鍒犻櫎鏍囧織锛�0锛氭湭鍒犻櫎 1锛氬凡鍒犻櫎锛� */
+    @ApiModelProperty("鍒犻櫎鏍囧織锛�0锛氭湭鍒犻櫎 1锛氬凡鍒犻櫎锛�")
+    private String delFlag;
+
+    /** 涓婁紶鏍囧織锛�0锛氭湭涓婁紶 1锛氬凡涓婁紶锛� */
+    @ApiModelProperty("涓婁紶鏍囧織锛�0锛氭湭涓婁紶 1锛氬凡涓婁紶锛�")
+            @Excel(name = "涓婁紶鏍囧織", readConverterExp = "0=锛氭湭涓婁紶,1=锛氬凡涓婁紶")
+    private Long isupload;
+
+    /** 涓婁紶鏃堕棿 */
+    @ApiModelProperty("涓婁紶鏃堕棿")
+            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+            @Excel(name = "涓婁紶鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date uploadTime;
+
+    /** 鍖婚櫌鏈烘瀯ID */
+    @ApiModelProperty("鍖婚櫌鏈烘瀯ID")
+            @Excel(name = "鍖婚櫌鏈烘瀯ID")
+    private String orgid;
+
+    /** 鐖禛UID */
+    @ApiModelProperty("鐖禛UID")
+            @Excel(name = "鐖禛UID")
+    private String pguid;
+
+    /** GUID */
+    @ApiModelProperty("GUID")
+            @Excel(name = "GUID")
+    private String guid;
+
+    /** 鐖禝D */
+    @ApiModelProperty("鐖禝D")
+            @Excel(name = "鐖禝D")
+    private Long pid;
+
+        }
+
diff --git a/smartor/src/main/java/com/smartor/mapper/PatMedOperationItemMapper.java b/smartor/src/main/java/com/smartor/mapper/PatMedOperationItemMapper.java
new file mode 100644
index 0000000..7609e36
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/mapper/PatMedOperationItemMapper.java
@@ -0,0 +1,63 @@
+package com.smartor.mapper;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import com.smartor.domain.PatMedOperationItem;
+
+/**
+ * 鎮h�呮鏌ユ楠岃褰曞瓙Mapper鎺ュ彛
+ *
+ * @author lihu
+ * @date 2025-02-21
+ */
+@Mapper
+public interface PatMedOperationItemMapper
+{
+    /**
+     * 鏌ヨ鎮h�呮鏌ユ楠岃褰曞瓙
+     *
+     * @param id 鎮h�呮鏌ユ楠岃褰曞瓙涓婚敭
+     * @return 鎮h�呮鏌ユ楠岃褰曞瓙
+     */
+    public PatMedOperationItem selectPatMedOperationItemById(Long id);
+
+    /**
+     * 鏌ヨ鎮h�呮鏌ユ楠岃褰曞瓙鍒楄〃
+     *
+     * @param patMedOperationItem 鎮h�呮鏌ユ楠岃褰曞瓙
+     * @return 鎮h�呮鏌ユ楠岃褰曞瓙闆嗗悎
+     */
+    public List<PatMedOperationItem> selectPatMedOperationItemList(PatMedOperationItem patMedOperationItem);
+
+    /**
+     * 鏂板鎮h�呮鏌ユ楠岃褰曞瓙
+     *
+     * @param patMedOperationItem 鎮h�呮鏌ユ楠岃褰曞瓙
+     * @return 缁撴灉
+     */
+    public int insertPatMedOperationItem(PatMedOperationItem patMedOperationItem);
+
+    /**
+     * 淇敼鎮h�呮鏌ユ楠岃褰曞瓙
+     *
+     * @param patMedOperationItem 鎮h�呮鏌ユ楠岃褰曞瓙
+     * @return 缁撴灉
+     */
+    public int updatePatMedOperationItem(PatMedOperationItem patMedOperationItem);
+
+    /**
+     * 鍒犻櫎鎮h�呮鏌ユ楠岃褰曞瓙
+     *
+     * @param id 鎮h�呮鏌ユ楠岃褰曞瓙涓婚敭
+     * @return 缁撴灉
+     */
+    public int deletePatMedOperationItemById(Long id);
+
+    /**
+     * 鎵归噺鍒犻櫎鎮h�呮鏌ユ楠岃褰曞瓙
+     *
+     * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+     * @return 缁撴灉
+     */
+    public int deletePatMedOperationItemByIds(Long[] ids);
+}
diff --git a/smartor/src/main/java/com/smartor/mapper/PatMedOperationMapper.java b/smartor/src/main/java/com/smartor/mapper/PatMedOperationMapper.java
index 285e118..3ba33b3 100644
--- a/smartor/src/main/java/com/smartor/mapper/PatMedOperationMapper.java
+++ b/smartor/src/main/java/com/smartor/mapper/PatMedOperationMapper.java
@@ -1,14 +1,15 @@
 package com.smartor.mapper;
 
 import java.util.List;
-import org.apache.ibatis.annotations.Mapper;
+
 import com.smartor.domain.PatMedOperation;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 鎮h�呮墜鏈褰昅apper鎺ュ彛
  *
  * @author lihu
- * @date 2024-08-05
+ * @date 2025-02-21
  */
 @Mapper
 public interface PatMedOperationMapper
diff --git a/smartor/src/main/java/com/smartor/service/IPatMedOperationItemService.java b/smartor/src/main/java/com/smartor/service/IPatMedOperationItemService.java
new file mode 100644
index 0000000..ba49083
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/IPatMedOperationItemService.java
@@ -0,0 +1,61 @@
+package com.smartor.service;
+
+import java.util.List;
+import com.smartor.domain.PatMedOperationItem;
+
+/**
+ * 鎮h�呮鏌ユ楠岃褰曞瓙Service鎺ュ彛
+ * 
+ * @author lihu
+ * @date 2025-02-21
+ */
+public interface IPatMedOperationItemService 
+{
+    /**
+     * 鏌ヨ鎮h�呮鏌ユ楠岃褰曞瓙
+     * 
+     * @param id 鎮h�呮鏌ユ楠岃褰曞瓙涓婚敭
+     * @return 鎮h�呮鏌ユ楠岃褰曞瓙
+     */
+    public PatMedOperationItem selectPatMedOperationItemById(Long id);
+
+    /**
+     * 鏌ヨ鎮h�呮鏌ユ楠岃褰曞瓙鍒楄〃
+     * 
+     * @param patMedOperationItem 鎮h�呮鏌ユ楠岃褰曞瓙
+     * @return 鎮h�呮鏌ユ楠岃褰曞瓙闆嗗悎
+     */
+    public List<PatMedOperationItem> selectPatMedOperationItemList(PatMedOperationItem patMedOperationItem);
+
+    /**
+     * 鏂板鎮h�呮鏌ユ楠岃褰曞瓙
+     * 
+     * @param patMedOperationItem 鎮h�呮鏌ユ楠岃褰曞瓙
+     * @return 缁撴灉
+     */
+    public int insertPatMedOperationItem(PatMedOperationItem patMedOperationItem);
+
+    /**
+     * 淇敼鎮h�呮鏌ユ楠岃褰曞瓙
+     * 
+     * @param patMedOperationItem 鎮h�呮鏌ユ楠岃褰曞瓙
+     * @return 缁撴灉
+     */
+    public int updatePatMedOperationItem(PatMedOperationItem patMedOperationItem);
+
+    /**
+     * 鎵归噺鍒犻櫎鎮h�呮鏌ユ楠岃褰曞瓙
+     * 
+     * @param ids 闇�瑕佸垹闄ょ殑鎮h�呮鏌ユ楠岃褰曞瓙涓婚敭闆嗗悎
+     * @return 缁撴灉
+     */
+    public int deletePatMedOperationItemByIds(Long[] ids);
+
+    /**
+     * 鍒犻櫎鎮h�呮鏌ユ楠岃褰曞瓙淇℃伅
+     * 
+     * @param id 鎮h�呮鏌ユ楠岃褰曞瓙涓婚敭
+     * @return 缁撴灉
+     */
+    public int deletePatMedOperationItemById(Long id);
+}
diff --git a/smartor/src/main/java/com/smartor/service/IPatMedOperationService.java b/smartor/src/main/java/com/smartor/service/IPatMedOperationService.java
index 1a90115..4ef5bf6 100644
--- a/smartor/src/main/java/com/smartor/service/IPatMedOperationService.java
+++ b/smartor/src/main/java/com/smartor/service/IPatMedOperationService.java
@@ -1,19 +1,20 @@
 package com.smartor.service;
 
-import java.util.List;
 import com.smartor.domain.PatMedOperation;
+
+import java.util.List;
 
 /**
  * 鎮h�呮墜鏈褰昐ervice鎺ュ彛
- * 
+ *
  * @author lihu
- * @date 2024-08-05
+ * @date 2025-02-21
  */
-public interface IPatMedOperationService 
+public interface IPatMedOperationService
 {
     /**
      * 鏌ヨ鎮h�呮墜鏈褰�
-     * 
+     *
      * @param id 鎮h�呮墜鏈褰曚富閿�
      * @return 鎮h�呮墜鏈褰�
      */
@@ -21,7 +22,7 @@
 
     /**
      * 鏌ヨ鎮h�呮墜鏈褰曞垪琛�
-     * 
+     *
      * @param patMedOperation 鎮h�呮墜鏈褰�
      * @return 鎮h�呮墜鏈褰曢泦鍚�
      */
@@ -29,7 +30,7 @@
 
     /**
      * 鏂板鎮h�呮墜鏈褰�
-     * 
+     *
      * @param patMedOperation 鎮h�呮墜鏈褰�
      * @return 缁撴灉
      */
@@ -37,7 +38,7 @@
 
     /**
      * 淇敼鎮h�呮墜鏈褰�
-     * 
+     *
      * @param patMedOperation 鎮h�呮墜鏈褰�
      * @return 缁撴灉
      */
@@ -45,7 +46,7 @@
 
     /**
      * 鎵归噺鍒犻櫎鎮h�呮墜鏈褰�
-     * 
+     *
      * @param ids 闇�瑕佸垹闄ょ殑鎮h�呮墜鏈褰曚富閿泦鍚�
      * @return 缁撴灉
      */
@@ -53,7 +54,7 @@
 
     /**
      * 鍒犻櫎鎮h�呮墜鏈褰曚俊鎭�
-     * 
+     *
      * @param id 鎮h�呮墜鏈褰曚富閿�
      * @return 缁撴灉
      */
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatMedOperationItemServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatMedOperationItemServiceImpl.java
new file mode 100644
index 0000000..3dac042
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedOperationItemServiceImpl.java
@@ -0,0 +1,96 @@
+package com.smartor.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.smartor.mapper.PatMedOperationItemMapper;
+import com.smartor.domain.PatMedOperationItem;
+import com.smartor.service.IPatMedOperationItemService;
+
+/**
+ * 鎮h�呮鏌ユ楠岃褰曞瓙Service涓氬姟灞傚鐞�
+ * 
+ * @author lihu
+ * @date 2025-02-21
+ */
+@Service
+public class PatMedOperationItemServiceImpl implements IPatMedOperationItemService 
+{
+    @Autowired
+    private PatMedOperationItemMapper patMedOperationItemMapper;
+
+    /**
+     * 鏌ヨ鎮h�呮鏌ユ楠岃褰曞瓙
+     * 
+     * @param id 鎮h�呮鏌ユ楠岃褰曞瓙涓婚敭
+     * @return 鎮h�呮鏌ユ楠岃褰曞瓙
+     */
+    @Override
+    public PatMedOperationItem selectPatMedOperationItemById(Long id)
+    {
+        return patMedOperationItemMapper.selectPatMedOperationItemById(id);
+    }
+
+    /**
+     * 鏌ヨ鎮h�呮鏌ユ楠岃褰曞瓙鍒楄〃
+     * 
+     * @param patMedOperationItem 鎮h�呮鏌ユ楠岃褰曞瓙
+     * @return 鎮h�呮鏌ユ楠岃褰曞瓙
+     */
+    @Override
+    public List<PatMedOperationItem> selectPatMedOperationItemList(PatMedOperationItem patMedOperationItem)
+    {
+        return patMedOperationItemMapper.selectPatMedOperationItemList(patMedOperationItem);
+    }
+
+    /**
+     * 鏂板鎮h�呮鏌ユ楠岃褰曞瓙
+     * 
+     * @param patMedOperationItem 鎮h�呮鏌ユ楠岃褰曞瓙
+     * @return 缁撴灉
+     */
+    @Override
+    public int insertPatMedOperationItem(PatMedOperationItem patMedOperationItem)
+    {
+        patMedOperationItem.setCreateTime(DateUtils.getNowDate());
+        return patMedOperationItemMapper.insertPatMedOperationItem(patMedOperationItem);
+    }
+
+    /**
+     * 淇敼鎮h�呮鏌ユ楠岃褰曞瓙
+     * 
+     * @param patMedOperationItem 鎮h�呮鏌ユ楠岃褰曞瓙
+     * @return 缁撴灉
+     */
+    @Override
+    public int updatePatMedOperationItem(PatMedOperationItem patMedOperationItem)
+    {
+        patMedOperationItem.setUpdateTime(DateUtils.getNowDate());
+        return patMedOperationItemMapper.updatePatMedOperationItem(patMedOperationItem);
+    }
+
+    /**
+     * 鎵归噺鍒犻櫎鎮h�呮鏌ユ楠岃褰曞瓙
+     * 
+     * @param ids 闇�瑕佸垹闄ょ殑鎮h�呮鏌ユ楠岃褰曞瓙涓婚敭
+     * @return 缁撴灉
+     */
+    @Override
+    public int deletePatMedOperationItemByIds(Long[] ids)
+    {
+        return patMedOperationItemMapper.deletePatMedOperationItemByIds(ids);
+    }
+
+    /**
+     * 鍒犻櫎鎮h�呮鏌ユ楠岃褰曞瓙淇℃伅
+     * 
+     * @param id 鎮h�呮鏌ユ楠岃褰曞瓙涓婚敭
+     * @return 缁撴灉
+     */
+    @Override
+    public int deletePatMedOperationItemById(Long id)
+    {
+        return patMedOperationItemMapper.deletePatMedOperationItemById(id);
+    }
+}
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatMedOperationServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatMedOperationServiceImpl.java
index 436ed44..76569fb 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedOperationServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedOperationServiceImpl.java
@@ -2,27 +2,27 @@
 
 import java.util.List;
 import com.ruoyi.common.utils.DateUtils;
+import com.smartor.domain.PatMedOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.smartor.mapper.PatMedOperationMapper;
-import com.smartor.domain.PatMedOperation;
 import com.smartor.service.IPatMedOperationService;
 
 /**
  * 鎮h�呮墜鏈褰昐ervice涓氬姟灞傚鐞�
- * 
+ *
  * @author lihu
- * @date 2024-08-05
+ * @date 2025-02-21
  */
 @Service
-public class PatMedOperationServiceImpl implements IPatMedOperationService 
+public class PatMedOperationServiceImpl implements IPatMedOperationService
 {
     @Autowired
     private PatMedOperationMapper patMedOperationMapper;
 
     /**
      * 鏌ヨ鎮h�呮墜鏈褰�
-     * 
+     *
      * @param id 鎮h�呮墜鏈褰曚富閿�
      * @return 鎮h�呮墜鏈褰�
      */
@@ -34,7 +34,7 @@
 
     /**
      * 鏌ヨ鎮h�呮墜鏈褰曞垪琛�
-     * 
+     *
      * @param patMedOperation 鎮h�呮墜鏈褰�
      * @return 鎮h�呮墜鏈褰�
      */
@@ -46,7 +46,7 @@
 
     /**
      * 鏂板鎮h�呮墜鏈褰�
-     * 
+     *
      * @param patMedOperation 鎮h�呮墜鏈褰�
      * @return 缁撴灉
      */
@@ -59,7 +59,7 @@
 
     /**
      * 淇敼鎮h�呮墜鏈褰�
-     * 
+     *
      * @param patMedOperation 鎮h�呮墜鏈褰�
      * @return 缁撴灉
      */
@@ -72,7 +72,7 @@
 
     /**
      * 鎵归噺鍒犻櫎鎮h�呮墜鏈褰�
-     * 
+     *
      * @param ids 闇�瑕佸垹闄ょ殑鎮h�呮墜鏈褰曚富閿�
      * @return 缁撴灉
      */
@@ -84,7 +84,7 @@
 
     /**
      * 鍒犻櫎鎮h�呮墜鏈褰曚俊鎭�
-     * 
+     *
      * @param id 鎮h�呮墜鏈褰曚富閿�
      * @return 缁撴灉
      */
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
index 50ee8cf..f4607c6 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -383,6 +383,7 @@
 
     @Override
     public Boolean addOperationInfo(Map dataMap) {
+        //
 
 
         return null;
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedOperationItemMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedOperationItemMapper.xml
new file mode 100644
index 0000000..aea8479
--- /dev/null
+++ b/smartor/src/main/resources/mapper/smartor/PatMedOperationItemMapper.xml
@@ -0,0 +1,275 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.smartor.mapper.PatMedOperationItemMapper">
+
+    <resultMap type="com.smartor.domain.PatMedOperationItem" id="PatMedOperationItemResult">
+            <result property="id" column="id"/>
+            <result property="opid" column="opid"/>
+            <result property="opcode" column="opcode"/>
+            <result property="opdesc" column="opdesc"/>
+            <result property="mainFlag" column="main_flag"/>
+            <result property="incitypecode" column="incitypecode"/>
+            <result property="incitypedesc" column="incitypedesc"/>
+            <result property="oplevelcode" column="oplevelcode"/>
+            <result property="opleveldesc" column="opleveldesc"/>
+            <result property="opposition" column="opposition"/>
+            <result property="delFlag" column="del_flag"/>
+            <result property="updateBy" column="update_by"/>
+            <result property="updateTime" column="update_time"/>
+            <result property="createBy" column="create_by"/>
+            <result property="createTime" column="create_time"/>
+            <result property="isupload" column="isupload"/>
+            <result property="uploadTime" column="upload_time"/>
+            <result property="orgid" column="orgid"/>
+            <result property="pguid" column="pguid"/>
+            <result property="guid" column="guid"/>
+            <result property="pid" column="pid"/>
+    </resultMap>
+
+    <sql id="selectPatMedOperationItemVo">
+        select id, opid, opcode, opdesc, main_flag, incitypecode, incitypedesc, oplevelcode, opleveldesc, opposition, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pguid, guid, pid
+        from pat_med_operation_item
+    </sql>
+
+    <select id="selectPatMedOperationItemList" parameterType="com.smartor.domain.PatMedOperationItem"
+            resultMap="PatMedOperationItemResult">
+        <include refid="selectPatMedOperationItemVo"/>
+        <where>
+                        <if test="opid != null ">
+                            and opid = #{opid}
+                        </if>
+                        <if test="opcode != null  and opcode != ''">
+                            and opcode = #{opcode}
+                        </if>
+                        <if test="opdesc != null  and opdesc != ''">
+                            and opdesc = #{opdesc}
+                        </if>
+                        <if test="mainFlag != null  and mainFlag != ''">
+                            and main_flag = #{mainFlag}
+                        </if>
+                        <if test="incitypecode != null  and incitypecode != ''">
+                            and incitypecode = #{incitypecode}
+                        </if>
+                        <if test="incitypedesc != null  and incitypedesc != ''">
+                            and incitypedesc = #{incitypedesc}
+                        </if>
+                        <if test="oplevelcode != null  and oplevelcode != ''">
+                            and oplevelcode = #{oplevelcode}
+                        </if>
+                        <if test="opleveldesc != null  and opleveldesc != ''">
+                            and opleveldesc = #{opleveldesc}
+                        </if>
+                        <if test="opposition != null  and opposition != ''">
+                            and opposition = #{opposition}
+                        </if>
+                        <if test="isupload != null ">
+                            and isupload = #{isupload}
+                        </if>
+                        <if test="uploadTime != null ">
+                            and upload_time = #{uploadTime}
+                        </if>
+                        <if test="orgid != null  and orgid != ''">
+                            and orgid = #{orgid}
+                        </if>
+                        <if test="pguid != null  and pguid != ''">
+                            and pguid = #{pguid}
+                        </if>
+                        <if test="guid != null  and guid != ''">
+                            and guid = #{guid}
+                        </if>
+                        <if test="pid != null ">
+                            and pid = #{pid}
+                        </if>
+        </where>
+    </select>
+
+    <select id="selectPatMedOperationItemById" parameterType="Long"
+            resultMap="PatMedOperationItemResult">
+            <include refid="selectPatMedOperationItemVo"/>
+            where id = #{id}
+    </select>
+
+    <insert id="insertPatMedOperationItem" parameterType="com.smartor.domain.PatMedOperationItem">
+        insert into pat_med_operation_item
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+                    <if test="id != null">id,
+                    </if>
+                    <if test="opid != null">opid,
+                    </if>
+                    <if test="opcode != null">opcode,
+                    </if>
+                    <if test="opdesc != null">opdesc,
+                    </if>
+                    <if test="mainFlag != null">main_flag,
+                    </if>
+                    <if test="incitypecode != null">incitypecode,
+                    </if>
+                    <if test="incitypedesc != null">incitypedesc,
+                    </if>
+                    <if test="oplevelcode != null">oplevelcode,
+                    </if>
+                    <if test="opleveldesc != null">opleveldesc,
+                    </if>
+                    <if test="opposition != null">opposition,
+                    </if>
+                    <if test="delFlag != null">del_flag,
+                    </if>
+                    <if test="updateBy != null">update_by,
+                    </if>
+                    <if test="updateTime != null">update_time,
+                    </if>
+                    <if test="createBy != null">create_by,
+                    </if>
+                    <if test="createTime != null">create_time,
+                    </if>
+                    <if test="isupload != null">isupload,
+                    </if>
+                    <if test="uploadTime != null">upload_time,
+                    </if>
+                    <if test="orgid != null">orgid,
+                    </if>
+                    <if test="pguid != null">pguid,
+                    </if>
+                    <if test="guid != null">guid,
+                    </if>
+                    <if test="pid != null">pid,
+                    </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+                    <if test="id != null">#{id},
+                    </if>
+                    <if test="opid != null">#{opid},
+                    </if>
+                    <if test="opcode != null">#{opcode},
+                    </if>
+                    <if test="opdesc != null">#{opdesc},
+                    </if>
+                    <if test="mainFlag != null">#{mainFlag},
+                    </if>
+                    <if test="incitypecode != null">#{incitypecode},
+                    </if>
+                    <if test="incitypedesc != null">#{incitypedesc},
+                    </if>
+                    <if test="oplevelcode != null">#{oplevelcode},
+                    </if>
+                    <if test="opleveldesc != null">#{opleveldesc},
+                    </if>
+                    <if test="opposition != null">#{opposition},
+                    </if>
+                    <if test="delFlag != null">#{delFlag},
+                    </if>
+                    <if test="updateBy != null">#{updateBy},
+                    </if>
+                    <if test="updateTime != null">#{updateTime},
+                    </if>
+                    <if test="createBy != null">#{createBy},
+                    </if>
+                    <if test="createTime != null">#{createTime},
+                    </if>
+                    <if test="isupload != null">#{isupload},
+                    </if>
+                    <if test="uploadTime != null">#{uploadTime},
+                    </if>
+                    <if test="orgid != null">#{orgid},
+                    </if>
+                    <if test="pguid != null">#{pguid},
+                    </if>
+                    <if test="guid != null">#{guid},
+                    </if>
+                    <if test="pid != null">#{pid},
+                    </if>
+        </trim>
+    </insert>
+
+    <update id="updatePatMedOperationItem" parameterType="com.smartor.domain.PatMedOperationItem">
+        update pat_med_operation_item
+        <trim prefix="SET" suffixOverrides=",">
+                    <if test="opid != null">opid =
+                        #{opid},
+                    </if>
+                    <if test="opcode != null">opcode =
+                        #{opcode},
+                    </if>
+                    <if test="opdesc != null">opdesc =
+                        #{opdesc},
+                    </if>
+                    <if test="mainFlag != null">main_flag =
+                        #{mainFlag},
+                    </if>
+                    <if test="incitypecode != null">incitypecode =
+                        #{incitypecode},
+                    </if>
+                    <if test="incitypedesc != null">incitypedesc =
+                        #{incitypedesc},
+                    </if>
+                    <if test="oplevelcode != null">oplevelcode =
+                        #{oplevelcode},
+                    </if>
+                    <if test="opleveldesc != null">opleveldesc =
+                        #{opleveldesc},
+                    </if>
+                    <if test="opposition != null">opposition =
+                        #{opposition},
+                    </if>
+                    <if test="delFlag != null">del_flag =
+                        #{delFlag},
+                    </if>
+                    <if test="updateBy != null">update_by =
+                        #{updateBy},
+                    </if>
+                    <if test="updateTime != null">update_time =
+                        #{updateTime},
+                    </if>
+                    <if test="createBy != null">create_by =
+                        #{createBy},
+                    </if>
+                    <if test="createTime != null">create_time =
+                        #{createTime},
+                    </if>
+                    <if test="isupload != null">isupload =
+                        #{isupload},
+                    </if>
+                    <if test="uploadTime != null">upload_time =
+                        #{uploadTime},
+                    </if>
+                    <if test="orgid != null">orgid =
+                        #{orgid},
+                    </if>
+                    <if test="pguid != null">pguid =
+                        #{pguid},
+                    </if>
+                    <if test="guid != null">guid =
+                        #{guid},
+                    </if>
+                    <if test="pid != null">pid =
+                        #{pid},
+                    </if>
+        </trim>
+        where id = #{id}
+    </update>
+
+                <update id="deletePatMedOperationItemById" parameterType="Long">
+        update pat_med_operation_item
+        <trim prefix="SET" suffixOverrides=",">
+            del_flag =1
+        </trim>
+        where  id = #{id}
+    </update>
+
+                            <update id="deletePatMedOperationItemByIds" parameterType="String">
+        update  pat_med_operation_item
+        <trim prefix="SET" suffixOverrides=",">
+            del_flag =1
+        </trim>
+        where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
+
+
+
+</mapper>
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedOperationMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedOperationMapper.xml
index f21e649..e153a6c 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedOperationMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedOperationMapper.xml
@@ -1,153 +1,746 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.smartor.mapper.PatMedOperationMapper">
 
     <resultMap type="com.smartor.domain.PatMedOperation" id="PatMedOperationResult">
-        <result property="id"    column="id"    />
-        <result property="serialnum"    column="serialnum"    />
-        <result property="patid"    column="patid"    />
-        <result property="operationname"    column="operationname"    />
-        <result property="operationcode"    column="operationcode"    />
-        <result property="operationid"    column="operationid"    />
-        <result property="operationtime"    column="operationtime"    />
-        <result property="visitid"    column="visitid"    />
-        <result property="visittype"    column="visittype"    />
-        <result property="status"    column="status"    />
-        <result property="schemetime"    column="schemetime"    />
-        <result property="schemestatus"    column="schemestatus"    />
-        <result property="orgid"    column="orgid"    />
-        <result property="delFlag"    column="del_flag"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="isupload"    column="isupload"    />
-        <result property="uploadTime"    column="upload_time"    />
-        <result property="pid"    column="pid"    />
-        <result property="guid"    column="guid"    />
+            <result property="id" column="id"/>
+            <result property="patid" column="patid"/>
+            <result property="patcode" column="patcode"/>
+            <result property="paname" column="paname"/>
+            <result property="opreqid" column="opreqid"/>
+            <result property="opreqcode" column="opreqcode"/>
+            <result property="opsstatus" column="opsstatus"/>
+            <result property="operationcode" column="operationcode"/>
+            <result property="operationname" column="operationname"/>
+            <result property="operatortime" column="operatortime"/>
+            <result property="opreqtime" column="opreqtime"/>
+            <result property="reqdoccode" column="reqdoccode"/>
+            <result property="reqdocname" column="reqdocname"/>
+            <result property="reqdeptcode" column="reqdeptcode"/>
+            <result property="reqdeptname" column="reqdeptname"/>
+            <result property="reqloccode" column="reqloccode"/>
+            <result property="reqlocname" column="reqlocname"/>
+            <result property="remark" column="remark"/>
+            <result property="surgeoncode" column="surgeoncode"/>
+            <result property="surgeonname" column="surgeonname"/>
+            <result property="firasscode" column="firasscode"/>
+            <result property="firassname" column="firassname"/>
+            <result property="secasscode" column="secasscode"/>
+            <result property="secassname" column="secassname"/>
+            <result property="thrasscode" column="thrasscode"/>
+            <result property="thrassname" column="thrassname"/>
+            <result property="canceltime" column="canceltime"/>
+            <result property="cancelreason" column="cancelreason"/>
+            <result property="cancelcode" column="cancelcode"/>
+            <result property="cancelname" column="cancelname"/>
+            <result property="visittype" column="visittype"/>
+            <result property="status" column="status"/>
+            <result property="schemetime" column="schemetime"/>
+            <result property="schemestatus" column="schemestatus"/>
+            <result property="delFlag" column="del_flag"/>
+            <result property="updateBy" column="update_by"/>
+            <result property="updateTime" column="update_time"/>
+            <result property="createBy" column="create_by"/>
+            <result property="createTime" column="create_time"/>
+            <result property="isupload" column="isupload"/>
+            <result property="uploadTime" column="upload_time"/>
+            <result property="orgid" column="orgid"/>
+            <result property="guid" column="guid"/>
+            <result property="pguid" column="pguid"/>
+            <result property="pid" column="pid"/>
+            <result property="inhospstate" column="inhospstate"/>
+            <result property="patno" column="patno"/>
+            <result property="patname" column="patname"/>
+            <result property="visitid" column="visitid"/>
+            <result property="serialnum" column="serialnum"/>
+            <result property="inhospno" column="inhospno"/>
+            <result property="hospitalname" column="hospitalname"/>
+            <result property="hospitalcode" column="hospitalcode"/>
+            <result property="deptid" column="deptid"/>
+            <result property="deptcode" column="deptcode"/>
+            <result property="deptname" column="deptname"/>
+            <result property="hospitaldistrictcode" column="hospitaldistrictcode"/>
+            <result property="hospitaldistrictname" column="hospitaldistrictname"/>
+            <result property="roomno" column="roomno"/>
+            <result property="bedNo" column="bed_no"/>
+            <result property="drcode" column="drcode"/>
+            <result property="drname" column="drname"/>
+            <result property="nurseId" column="nurse_id"/>
+            <result property="nurseName" column="nurse_name"/>
     </resultMap>
 
     <sql id="selectPatMedOperationVo">
-        select id, serialnum, patid, operationname, operationcode, operationid, operationtime, visitid, visittype, status, schemetime, schemestatus, orgid, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, pid, guid from pat_med_operation
+        select id, patid, patcode, paname, opreqid, opreqcode, opsstatus, operationcode, operationname,  operatortime, opreqtime, reqdoccode, reqdocname, reqdeptcode, reqdeptname, reqloccode, reqlocname, remark, surgeoncode, surgeonname, firasscode, firassname, secasscode, secassname, thrasscode, thrassname, canceltime, cancelreason, cancelcode, cancelname, visittype, status, schemetime, schemestatus, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, guid, pguid, pid, inhospstate, patno, patname, visitid, serialnum, inhospno, hospitalname, hospitalcode, deptid, deptcode, deptname, hospitaldistrictcode, hospitaldistrictname, roomno, bed_no, drcode, drname, nurse_id, nurse_name
+        from pat_med_operation
     </sql>
 
-    <select id="selectPatMedOperationList" parameterType="com.smartor.domain.PatMedOperation" resultMap="PatMedOperationResult">
+    <select id="selectPatMedOperationList" parameterType="com.smartor.domain.PatMedOperation"
+            resultMap="PatMedOperationResult">
         <include refid="selectPatMedOperationVo"/>
         <where>
-            <if test="serialnum != null  and serialnum != ''"> and serialnum = #{serialnum}</if>
-            <if test="patid != null "> and patid = #{patid}</if>
-            <if test="operationname != null  and operationname != ''"> and operationname like concat('%', #{operationname}, '%')</if>
-            <if test="operationcode != null  and operationcode != ''"> and operationcode = #{operationcode}</if>
-            <if test="operationid != null "> and operationid = #{operationid}</if>
-            <if test="operationtime != null "> and operationtime = #{operationtime}</if>
-            <if test="visitid != null "> and visitid = #{visitid}</if>
-            <if test="visittype != null "> and visittype = #{visittype}</if>
-            <if test="status != null "> and status = #{status}</if>
-            <if test="schemetime != null "> and schemetime = #{schemetime}</if>
-            <if test="schemestatus != null "> and schemestatus = #{schemestatus}</if>
-            <if test="orgid != null  and orgid != ''"> and orgid = #{orgid}</if>
-            <if test="isupload != null "> and isupload = #{isupload}</if>
-            <if test="uploadTime != null "> and upload_time = #{uploadTime}</if>
-            <if test="pid != null "> and pid = #{pid}</if>
-            <if test="guid != null  and guid != ''"> and guid = #{guid}</if>
+                        <if test="patid != null ">
+                            and patid = #{patid}
+                        </if>
+                        <if test="patcode != null  and patcode != ''">
+                            and patcode = #{patcode}
+                        </if>
+                        <if test="paname != null  and paname != ''">
+                            and paname like concat('%', #{paname}, '%')
+                        </if>
+                        <if test="opreqid != null ">
+                            and opreqid = #{opreqid}
+                        </if>
+                        <if test="opreqcode != null  and opreqcode != ''">
+                            and opreqcode = #{opreqcode}
+                        </if>
+                        <if test="opsstatus != null  and opsstatus != ''">
+                            and opsstatus = #{opsstatus}
+                        </if>
+                        <if test="operationcode != null  and operationcode != ''">
+                            and operationcode = #{operationcode}
+                        </if>
+                        <if test="operationname != null  and operationname != ''">
+                            and operationname like concat('%', #{operationname}, '%')
+                        </if>
+
+                        <if test="operatortime != null ">
+                            and operatortime = #{operatortime}
+                        </if>
+                        <if test="opreqtime != null ">
+                            and opreqtime = #{opreqtime}
+                        </if>
+                        <if test="reqdoccode != null  and reqdoccode != ''">
+                            and reqdoccode = #{reqdoccode}
+                        </if>
+                        <if test="reqdocname != null  and reqdocname != ''">
+                            and reqdocname like concat('%', #{reqdocname}, '%')
+                        </if>
+                        <if test="reqdeptcode != null  and reqdeptcode != ''">
+                            and reqdeptcode = #{reqdeptcode}
+                        </if>
+                        <if test="reqdeptname != null  and reqdeptname != ''">
+                            and reqdeptname like concat('%', #{reqdeptname}, '%')
+                        </if>
+                        <if test="reqloccode != null  and reqloccode != ''">
+                            and reqloccode = #{reqloccode}
+                        </if>
+                        <if test="reqlocname != null  and reqlocname != ''">
+                            and reqlocname like concat('%', #{reqlocname}, '%')
+                        </if>
+                        <if test="surgeoncode != null  and surgeoncode != ''">
+                            and surgeoncode = #{surgeoncode}
+                        </if>
+                        <if test="surgeonname != null  and surgeonname != ''">
+                            and surgeonname like concat('%', #{surgeonname}, '%')
+                        </if>
+                        <if test="firasscode != null  and firasscode != ''">
+                            and firasscode = #{firasscode}
+                        </if>
+                        <if test="firassname != null  and firassname != ''">
+                            and firassname like concat('%', #{firassname}, '%')
+                        </if>
+                        <if test="secasscode != null  and secasscode != ''">
+                            and secasscode = #{secasscode}
+                        </if>
+                        <if test="secassname != null  and secassname != ''">
+                            and secassname like concat('%', #{secassname}, '%')
+                        </if>
+                        <if test="thrasscode != null  and thrasscode != ''">
+                            and thrasscode = #{thrasscode}
+                        </if>
+                        <if test="thrassname != null  and thrassname != ''">
+                            and thrassname like concat('%', #{thrassname}, '%')
+                        </if>
+                        <if test="canceltime != null  and canceltime != ''">
+                            and canceltime = #{canceltime}
+                        </if>
+                        <if test="cancelreason != null  and cancelreason != ''">
+                            and cancelreason = #{cancelreason}
+                        </if>
+                        <if test="cancelcode != null  and cancelcode != ''">
+                            and cancelcode = #{cancelcode}
+                        </if>
+                        <if test="cancelname != null  and cancelname != ''">
+                            and cancelname like concat('%', #{cancelname}, '%')
+                        </if>
+                        <if test="visittype != null ">
+                            and visittype = #{visittype}
+                        </if>
+                        <if test="status != null  and status != ''">
+                            and status = #{status}
+                        </if>
+                        <if test="schemetime != null ">
+                            and schemetime = #{schemetime}
+                        </if>
+                        <if test="schemestatus != null ">
+                            and schemestatus = #{schemestatus}
+                        </if>
+                        <if test="isupload != null ">
+                            and isupload = #{isupload}
+                        </if>
+                        <if test="uploadTime != null ">
+                            and upload_time = #{uploadTime}
+                        </if>
+                        <if test="orgid != null  and orgid != ''">
+                            and orgid = #{orgid}
+                        </if>
+                        <if test="guid != null  and guid != ''">
+                            and guid = #{guid}
+                        </if>
+                        <if test="pguid != null  and pguid != ''">
+                            and pguid = #{pguid}
+                        </if>
+                        <if test="pid != null ">
+                            and pid = #{pid}
+                        </if>
+                        <if test="inhospstate != null  and inhospstate != ''">
+                            and inhospstate = #{inhospstate}
+                        </if>
+                        <if test="patno != null  and patno != ''">
+                            and patno = #{patno}
+                        </if>
+                        <if test="patname != null  and patname != ''">
+                            and patname like concat('%', #{patname}, '%')
+                        </if>
+                        <if test="visitid != null ">
+                            and visitid = #{visitid}
+                        </if>
+                        <if test="serialnum != null  and serialnum != ''">
+                            and serialnum = #{serialnum}
+                        </if>
+                        <if test="inhospno != null  and inhospno != ''">
+                            and inhospno = #{inhospno}
+                        </if>
+                        <if test="hospitalname != null  and hospitalname != ''">
+                            and hospitalname like concat('%', #{hospitalname}, '%')
+                        </if>
+                        <if test="hospitalcode != null  and hospitalcode != ''">
+                            and hospitalcode = #{hospitalcode}
+                        </if>
+                        <if test="deptid != null  and deptid != ''">
+                            and deptid = #{deptid}
+                        </if>
+                        <if test="deptcode != null  and deptcode != ''">
+                            and deptcode = #{deptcode}
+                        </if>
+                        <if test="deptname != null  and deptname != ''">
+                            and deptname like concat('%', #{deptname}, '%')
+                        </if>
+                        <if test="hospitaldistrictcode != null  and hospitaldistrictcode != ''">
+                            and hospitaldistrictcode = #{hospitaldistrictcode}
+                        </if>
+                        <if test="hospitaldistrictname != null  and hospitaldistrictname != ''">
+                            and hospitaldistrictname like concat('%', #{hospitaldistrictname}, '%')
+                        </if>
+                        <if test="roomno != null  and roomno != ''">
+                            and roomno = #{roomno}
+                        </if>
+                        <if test="bedNo != null  and bedNo != ''">
+                            and bed_no = #{bedNo}
+                        </if>
+                        <if test="drcode != null  and drcode != ''">
+                            and drcode = #{drcode}
+                        </if>
+                        <if test="drname != null  and drname != ''">
+                            and drname like concat('%', #{drname}, '%')
+                        </if>
+                        <if test="nurseId != null  and nurseId != ''">
+                            and nurse_id = #{nurseId}
+                        </if>
+                        <if test="nurseName != null  and nurseName != ''">
+                            and nurse_name like concat('%', #{nurseName}, '%')
+                        </if>
         </where>
     </select>
 
-    <select id="selectPatMedOperationById" parameterType="Long" resultMap="PatMedOperationResult">
-        <include refid="selectPatMedOperationVo"/>
-        where id = #{id}
+    <select id="selectPatMedOperationById" parameterType="Long"
+            resultMap="PatMedOperationResult">
+            <include refid="selectPatMedOperationVo"/>
+            where id = #{id}
     </select>
 
     <insert id="insertPatMedOperation" parameterType="com.smartor.domain.PatMedOperation">
         insert into pat_med_operation
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="serialnum != null">serialnum,</if>
-            <if test="patid != null">patid,</if>
-            <if test="operationname != null">operationname,</if>
-            <if test="operationcode != null">operationcode,</if>
-            <if test="operationid != null">operationid,</if>
-            <if test="operationtime != null">operationtime,</if>
-            <if test="visitid != null">visitid,</if>
-            <if test="visittype != null">visittype,</if>
-            <if test="status != null">status,</if>
-            <if test="schemetime != null">schemetime,</if>
-            <if test="schemestatus != null">schemestatus,</if>
-            <if test="orgid != null">orgid,</if>
-            <if test="delFlag != null">del_flag,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="isupload != null">isupload,</if>
-            <if test="uploadTime != null">upload_time,</if>
-            <if test="pid != null">pid,</if>
-            <if test="guid != null">guid,</if>
-         </trim>
+                    <if test="id != null">id,
+                    </if>
+                    <if test="patid != null">patid,
+                    </if>
+                    <if test="patcode != null">patcode,
+                    </if>
+                    <if test="paname != null">paname,
+                    </if>
+                    <if test="opreqid != null">opreqid,
+                    </if>
+                    <if test="opreqcode != null">opreqcode,
+                    </if>
+                    <if test="opsstatus != null">opsstatus,
+                    </if>
+                    <if test="operationcode != null">operationcode,
+                    </if>
+                    <if test="operationname != null">operationname,
+                    </if>
+                    <if test="operatortime != null">operatortime,
+                    </if>
+                    <if test="opreqtime != null">opreqtime,
+                    </if>
+                    <if test="reqdoccode != null">reqdoccode,
+                    </if>
+                    <if test="reqdocname != null">reqdocname,
+                    </if>
+                    <if test="reqdeptcode != null">reqdeptcode,
+                    </if>
+                    <if test="reqdeptname != null">reqdeptname,
+                    </if>
+                    <if test="reqloccode != null">reqloccode,
+                    </if>
+                    <if test="reqlocname != null">reqlocname,
+                    </if>
+                    <if test="remark != null">remark,
+                    </if>
+                    <if test="surgeoncode != null">surgeoncode,
+                    </if>
+                    <if test="surgeonname != null">surgeonname,
+                    </if>
+                    <if test="firasscode != null">firasscode,
+                    </if>
+                    <if test="firassname != null">firassname,
+                    </if>
+                    <if test="secasscode != null">secasscode,
+                    </if>
+                    <if test="secassname != null">secassname,
+                    </if>
+                    <if test="thrasscode != null">thrasscode,
+                    </if>
+                    <if test="thrassname != null">thrassname,
+                    </if>
+                    <if test="canceltime != null">canceltime,
+                    </if>
+                    <if test="cancelreason != null">cancelreason,
+                    </if>
+                    <if test="cancelcode != null">cancelcode,
+                    </if>
+                    <if test="cancelname != null">cancelname,
+                    </if>
+                    <if test="visittype != null">visittype,
+                    </if>
+                    <if test="status != null">status,
+                    </if>
+                    <if test="schemetime != null">schemetime,
+                    </if>
+                    <if test="schemestatus != null">schemestatus,
+                    </if>
+                    <if test="delFlag != null">del_flag,
+                    </if>
+                    <if test="updateBy != null">update_by,
+                    </if>
+                    <if test="updateTime != null">update_time,
+                    </if>
+                    <if test="createBy != null">create_by,
+                    </if>
+                    <if test="createTime != null">create_time,
+                    </if>
+                    <if test="isupload != null">isupload,
+                    </if>
+                    <if test="uploadTime != null">upload_time,
+                    </if>
+                    <if test="orgid != null">orgid,
+                    </if>
+                    <if test="guid != null">guid,
+                    </if>
+                    <if test="pguid != null">pguid,
+                    </if>
+                    <if test="pid != null">pid,
+                    </if>
+                    <if test="inhospstate != null">inhospstate,
+                    </if>
+                    <if test="patno != null">patno,
+                    </if>
+                    <if test="patname != null">patname,
+                    </if>
+                    <if test="visitid != null">visitid,
+                    </if>
+                    <if test="serialnum != null">serialnum,
+                    </if>
+                    <if test="inhospno != null">inhospno,
+                    </if>
+                    <if test="hospitalname != null">hospitalname,
+                    </if>
+                    <if test="hospitalcode != null">hospitalcode,
+                    </if>
+                    <if test="deptid != null">deptid,
+                    </if>
+                    <if test="deptcode != null">deptcode,
+                    </if>
+                    <if test="deptname != null">deptname,
+                    </if>
+                    <if test="hospitaldistrictcode != null">hospitaldistrictcode,
+                    </if>
+                    <if test="hospitaldistrictname != null">hospitaldistrictname,
+                    </if>
+                    <if test="roomno != null">roomno,
+                    </if>
+                    <if test="bedNo != null">bed_no,
+                    </if>
+                    <if test="drcode != null">drcode,
+                    </if>
+                    <if test="drname != null">drname,
+                    </if>
+                    <if test="nurseId != null">nurse_id,
+                    </if>
+                    <if test="nurseName != null">nurse_name,
+                    </if>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
-            <if test="serialnum != null">#{serialnum},</if>
-            <if test="patid != null">#{patid},</if>
-            <if test="operationname != null">#{operationname},</if>
-            <if test="operationcode != null">#{operationcode},</if>
-            <if test="operationid != null">#{operationid},</if>
-            <if test="operationtime != null">#{operationtime},</if>
-            <if test="visitid != null">#{visitid},</if>
-            <if test="visittype != null">#{visittype},</if>
-            <if test="status != null">#{status},</if>
-            <if test="schemetime != null">#{schemetime},</if>
-            <if test="schemestatus != null">#{schemestatus},</if>
-            <if test="orgid != null">#{orgid},</if>
-            <if test="delFlag != null">#{delFlag},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="isupload != null">#{isupload},</if>
-            <if test="uploadTime != null">#{uploadTime},</if>
-            <if test="pid != null">#{pid},</if>
-            <if test="guid != null">#{guid},</if>
-         </trim>
+                    <if test="id != null">#{id},
+                    </if>
+                    <if test="patid != null">#{patid},
+                    </if>
+                    <if test="patcode != null">#{patcode},
+                    </if>
+                    <if test="paname != null">#{paname},
+                    </if>
+                    <if test="opreqid != null">#{opreqid},
+                    </if>
+                    <if test="opreqcode != null">#{opreqcode},
+                    </if>
+                    <if test="opsstatus != null">#{opsstatus},
+                    </if>
+                    <if test="operationcode != null">#{operationcode},
+                    </if>
+                    <if test="operationname != null">#{operationname},
+                    </if>
+                    <if test="operatortime != null">#{operatortime},
+                    </if>
+                    <if test="opreqtime != null">#{opreqtime},
+                    </if>
+                    <if test="reqdoccode != null">#{reqdoccode},
+                    </if>
+                    <if test="reqdocname != null">#{reqdocname},
+                    </if>
+                    <if test="reqdeptcode != null">#{reqdeptcode},
+                    </if>
+                    <if test="reqdeptname != null">#{reqdeptname},
+                    </if>
+                    <if test="reqloccode != null">#{reqloccode},
+                    </if>
+                    <if test="reqlocname != null">#{reqlocname},
+                    </if>
+                    <if test="remark != null">#{remark},
+                    </if>
+                    <if test="surgeoncode != null">#{surgeoncode},
+                    </if>
+                    <if test="surgeonname != null">#{surgeonname},
+                    </if>
+                    <if test="firasscode != null">#{firasscode},
+                    </if>
+                    <if test="firassname != null">#{firassname},
+                    </if>
+                    <if test="secasscode != null">#{secasscode},
+                    </if>
+                    <if test="secassname != null">#{secassname},
+                    </if>
+                    <if test="thrasscode != null">#{thrasscode},
+                    </if>
+                    <if test="thrassname != null">#{thrassname},
+                    </if>
+                    <if test="canceltime != null">#{canceltime},
+                    </if>
+                    <if test="cancelreason != null">#{cancelreason},
+                    </if>
+                    <if test="cancelcode != null">#{cancelcode},
+                    </if>
+                    <if test="cancelname != null">#{cancelname},
+                    </if>
+                    <if test="visittype != null">#{visittype},
+                    </if>
+                    <if test="status != null">#{status},
+                    </if>
+                    <if test="schemetime != null">#{schemetime},
+                    </if>
+                    <if test="schemestatus != null">#{schemestatus},
+                    </if>
+                    <if test="delFlag != null">#{delFlag},
+                    </if>
+                    <if test="updateBy != null">#{updateBy},
+                    </if>
+                    <if test="updateTime != null">#{updateTime},
+                    </if>
+                    <if test="createBy != null">#{createBy},
+                    </if>
+                    <if test="createTime != null">#{createTime},
+                    </if>
+                    <if test="isupload != null">#{isupload},
+                    </if>
+                    <if test="uploadTime != null">#{uploadTime},
+                    </if>
+                    <if test="orgid != null">#{orgid},
+                    </if>
+                    <if test="guid != null">#{guid},
+                    </if>
+                    <if test="pguid != null">#{pguid},
+                    </if>
+                    <if test="pid != null">#{pid},
+                    </if>
+                    <if test="inhospstate != null">#{inhospstate},
+                    </if>
+                    <if test="patno != null">#{patno},
+                    </if>
+                    <if test="patname != null">#{patname},
+                    </if>
+                    <if test="visitid != null">#{visitid},
+                    </if>
+                    <if test="serialnum != null">#{serialnum},
+                    </if>
+                    <if test="inhospno != null">#{inhospno},
+                    </if>
+                    <if test="hospitalname != null">#{hospitalname},
+                    </if>
+                    <if test="hospitalcode != null">#{hospitalcode},
+                    </if>
+                    <if test="deptid != null">#{deptid},
+                    </if>
+                    <if test="deptcode != null">#{deptcode},
+                    </if>
+                    <if test="deptname != null">#{deptname},
+                    </if>
+                    <if test="hospitaldistrictcode != null">#{hospitaldistrictcode},
+                    </if>
+                    <if test="hospitaldistrictname != null">#{hospitaldistrictname},
+                    </if>
+                    <if test="roomno != null">#{roomno},
+                    </if>
+                    <if test="bedNo != null">#{bedNo},
+                    </if>
+                    <if test="drcode != null">#{drcode},
+                    </if>
+                    <if test="drname != null">#{drname},
+                    </if>
+                    <if test="nurseId != null">#{nurseId},
+                    </if>
+                    <if test="nurseName != null">#{nurseName},
+                    </if>
+        </trim>
     </insert>
 
     <update id="updatePatMedOperation" parameterType="com.smartor.domain.PatMedOperation">
         update pat_med_operation
         <trim prefix="SET" suffixOverrides=",">
-            <if test="serialnum != null">serialnum = #{serialnum},</if>
-            <if test="patid != null">patid = #{patid},</if>
-            <if test="operationname != null">operationname = #{operationname},</if>
-            <if test="operationcode != null">operationcode = #{operationcode},</if>
-            <if test="operationid != null">operationid = #{operationid},</if>
-            <if test="operationtime != null">operationtime = #{operationtime},</if>
-            <if test="visitid != null">visitid = #{visitid},</if>
-            <if test="visittype != null">visittype = #{visittype},</if>
-            <if test="status != null">status = #{status},</if>
-            <if test="schemetime != null">schemetime = #{schemetime},</if>
-            <if test="schemestatus != null">schemestatus = #{schemestatus},</if>
-            <if test="orgid != null">orgid = #{orgid},</if>
-            <if test="delFlag != null">del_flag = #{delFlag},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="isupload != null">isupload = #{isupload},</if>
-            <if test="uploadTime != null">upload_time = #{uploadTime},</if>
-            <if test="pid != null">pid = #{pid},</if>
-            <if test="guid != null">guid = #{guid},</if>
+                    <if test="patid != null">patid =
+                        #{patid},
+                    </if>
+                    <if test="patcode != null">patcode =
+                        #{patcode},
+                    </if>
+                    <if test="paname != null">paname =
+                        #{paname},
+                    </if>
+                    <if test="opreqid != null">opreqid =
+                        #{opreqid},
+                    </if>
+                    <if test="opreqcode != null">opreqcode =
+                        #{opreqcode},
+                    </if>
+                    <if test="opsstatus != null">opsstatus =
+                        #{opsstatus},
+                    </if>
+                    <if test="operationcode != null">operationcode =
+                        #{operationcode},
+                    </if>
+                    <if test="operationname != null">operationname =
+                        #{operationname},
+                    </if>
+                    <if test="operatortime != null">operatortime =
+                        #{operatortime},
+                    </if>
+                    <if test="opreqtime != null">opreqtime =
+                        #{opreqtime},
+                    </if>
+                    <if test="reqdoccode != null">reqdoccode =
+                        #{reqdoccode},
+                    </if>
+                    <if test="reqdocname != null">reqdocname =
+                        #{reqdocname},
+                    </if>
+                    <if test="reqdeptcode != null">reqdeptcode =
+                        #{reqdeptcode},
+                    </if>
+                    <if test="reqdeptname != null">reqdeptname =
+                        #{reqdeptname},
+                    </if>
+                    <if test="reqloccode != null">reqloccode =
+                        #{reqloccode},
+                    </if>
+                    <if test="reqlocname != null">reqlocname =
+                        #{reqlocname},
+                    </if>
+                    <if test="remark != null">remark =
+                        #{remark},
+                    </if>
+                    <if test="surgeoncode != null">surgeoncode =
+                        #{surgeoncode},
+                    </if>
+                    <if test="surgeonname != null">surgeonname =
+                        #{surgeonname},
+                    </if>
+                    <if test="firasscode != null">firasscode =
+                        #{firasscode},
+                    </if>
+                    <if test="firassname != null">firassname =
+                        #{firassname},
+                    </if>
+                    <if test="secasscode != null">secasscode =
+                        #{secasscode},
+                    </if>
+                    <if test="secassname != null">secassname =
+                        #{secassname},
+                    </if>
+                    <if test="thrasscode != null">thrasscode =
+                        #{thrasscode},
+                    </if>
+                    <if test="thrassname != null">thrassname =
+                        #{thrassname},
+                    </if>
+                    <if test="canceltime != null">canceltime =
+                        #{canceltime},
+                    </if>
+                    <if test="cancelreason != null">cancelreason =
+                        #{cancelreason},
+                    </if>
+                    <if test="cancelcode != null">cancelcode =
+                        #{cancelcode},
+                    </if>
+                    <if test="cancelname != null">cancelname =
+                        #{cancelname},
+                    </if>
+                    <if test="visittype != null">visittype =
+                        #{visittype},
+                    </if>
+                    <if test="status != null">status =
+                        #{status},
+                    </if>
+                    <if test="schemetime != null">schemetime =
+                        #{schemetime},
+                    </if>
+                    <if test="schemestatus != null">schemestatus =
+                        #{schemestatus},
+                    </if>
+                    <if test="delFlag != null">del_flag =
+                        #{delFlag},
+                    </if>
+                    <if test="updateBy != null">update_by =
+                        #{updateBy},
+                    </if>
+                    <if test="updateTime != null">update_time =
+                        #{updateTime},
+                    </if>
+                    <if test="createBy != null">create_by =
+                        #{createBy},
+                    </if>
+                    <if test="createTime != null">create_time =
+                        #{createTime},
+                    </if>
+                    <if test="isupload != null">isupload =
+                        #{isupload},
+                    </if>
+                    <if test="uploadTime != null">upload_time =
+                        #{uploadTime},
+                    </if>
+                    <if test="orgid != null">orgid =
+                        #{orgid},
+                    </if>
+                    <if test="guid != null">guid =
+                        #{guid},
+                    </if>
+                    <if test="pguid != null">pguid =
+                        #{pguid},
+                    </if>
+                    <if test="pid != null">pid =
+                        #{pid},
+                    </if>
+                    <if test="inhospstate != null">inhospstate =
+                        #{inhospstate},
+                    </if>
+                    <if test="patno != null">patno =
+                        #{patno},
+                    </if>
+                    <if test="patname != null">patname =
+                        #{patname},
+                    </if>
+                    <if test="visitid != null">visitid =
+                        #{visitid},
+                    </if>
+                    <if test="serialnum != null">serialnum =
+                        #{serialnum},
+                    </if>
+                    <if test="inhospno != null">inhospno =
+                        #{inhospno},
+                    </if>
+                    <if test="hospitalname != null">hospitalname =
+                        #{hospitalname},
+                    </if>
+                    <if test="hospitalcode != null">hospitalcode =
+                        #{hospitalcode},
+                    </if>
+                    <if test="deptid != null">deptid =
+                        #{deptid},
+                    </if>
+                    <if test="deptcode != null">deptcode =
+                        #{deptcode},
+                    </if>
+                    <if test="deptname != null">deptname =
+                        #{deptname},
+                    </if>
+                    <if test="hospitaldistrictcode != null">hospitaldistrictcode =
+                        #{hospitaldistrictcode},
+                    </if>
+                    <if test="hospitaldistrictname != null">hospitaldistrictname =
+                        #{hospitaldistrictname},
+                    </if>
+                    <if test="roomno != null">roomno =
+                        #{roomno},
+                    </if>
+                    <if test="bedNo != null">bed_no =
+                        #{bedNo},
+                    </if>
+                    <if test="drcode != null">drcode =
+                        #{drcode},
+                    </if>
+                    <if test="drname != null">drname =
+                        #{drname},
+                    </if>
+                    <if test="nurseId != null">nurse_id =
+                        #{nurseId},
+                    </if>
+                    <if test="nurseName != null">nurse_name =
+                        #{nurseName},
+                    </if>
         </trim>
         where id = #{id}
     </update>
 
-    <delete id="deletePatMedOperationById" parameterType="Long">
-        delete from pat_med_operation where id = #{id}
-    </delete>
+                <update id="deletePatMedOperationById" parameterType="Long">
+        update pat_med_operation
+        <trim prefix="SET" suffixOverrides=",">
+            del_flag =1
+        </trim>
+        where  id = #{id}
+    </update>
 
-    <delete id="deletePatMedOperationByIds" parameterType="String">
-        delete from pat_med_operation where id in
+                            <update id="deletePatMedOperationByIds" parameterType="String">
+        update  pat_med_operation
+        <trim prefix="SET" suffixOverrides=",">
+            del_flag =1
+        </trim>
+        where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
-    </delete>
+    </update>
+
+
+
+
 </mapper>

--
Gitblit v1.9.3