From 562a960261b75d70abd65aa10528f09aeece94e8 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 24 九月 2024 09:49:23 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/java/com/smartor/mapper/SysUserImportMapper.java                        |   63 ++
 smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml                          |   17 
 smartor/src/main/resources/mapper/smartor/SysUserImportMapper.xml                        |  621 ++++++++++++++++++++++++++++
 smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml                       |   16 
 smartor/src/main/java/com/smartor/domain/SysUserImport.java                              |  330 +++++++++++++++
 smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java              |   79 +++
 smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml                           |   16 
 smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml                         |   35 -
 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java                             |   61 +-
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java |   14 
 smartor/src/main/java/com/smartor/domain/ServiceSubTaskQueryReq.java                     |    5 
 smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java               |   37 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java    |    2 
 smartor/src/main/java/com/smartor/service/IServiceTaskService.java                       |    2 
 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java      |    2 
 15 files changed, 1,169 insertions(+), 131 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
index 6070661..7a0b1e6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.smartor;
 
+import com.github.pagehelper.ISelect;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -47,7 +48,18 @@
     @PostMapping("/patItem")
     public TableDataInfo patItem(@RequestBody ServiceSubtask ivrTaskcall) {
         PageUtils.startPageByPost(ivrTaskcall.getPageNum(), ivrTaskcall.getPageSize());
-        return getDataTable(serviceSubtaskService.patItem(ivrTaskcall));
+        List<ServiceSubtask> serviceSubtaskList = serviceSubtaskService.patItem(ivrTaskcall);
+        //鑾峰彇total
+        long total = PageUtils.count(new ISelect() {
+            @Override
+            public void doSelect() {
+                ivrTaskcall.setPageNum(null);
+                ivrTaskcall.setPageSize(null);
+                serviceSubtaskService.patItem(ivrTaskcall);
+            }
+        });
+        return getDataTable2(total, serviceSubtaskList);
+//        return getDataTable(serviceSubtaskService.patItem(ivrTaskcall));
     }
 
     /**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java
index 3e4d7dc..87c4538 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java
@@ -186,7 +186,7 @@
         }
 
         log.info("tid鍜宲id鐨勫�间负锛歿},{}", tid, pid);
-        return success(serviceTaskService.getScriptInfoByCondition(tid, pid));
+        return success(serviceTaskService.getScriptInfoByCondition(tid, pid, true));
     }
 
 }
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index dfe47ea..f55613d 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -2,6 +2,7 @@
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
+import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.reflect.TypeToken;
@@ -17,6 +18,7 @@
 import com.smartor.common.SendService;
 import com.smartor.domain.*;
 import com.smartor.mapper.ServiceTaskMapper;
+import com.smartor.mapper.SysUserImportMapper;
 import com.smartor.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -63,6 +65,9 @@
 
     @Autowired
     private PlatformTransactionManager transactionManager;
+
+    @Autowired
+    private SysUserImportMapper sysUserImportMapper;
 
     @Value("${localIP}")
     private String localIP;
@@ -119,36 +124,30 @@
     }
 
     public void importData() {
-//        String filePath = "path/to/your/file.txt"; // 鏇挎崲涓轰綘鐨勬枃浠惰矾寰�
-//
-//        try {
-//            // 璇诲彇鏂囦欢鍐呭
-//            String jsonContent = new String(Files.readAllBytes(Paths.get(filePath)));
-//
-//            // 鍒涘缓ObjectMapper瀵硅薄
-//            ObjectMapper objectMapper = new ObjectMapper();
-//
-//            // 瑙ｆ瀽JSON涓篔sonNode
-//            JsonNode rootNode = objectMapper.readTree(jsonContent);
-//            // 鑾峰彇resultList
-//            JsonNode resultListNode = rootNode.path("results").path("resultList");
-//            // 閬嶅巻resultList涓殑姣忎釜瀵硅薄
-//            for (JsonNode item : resultListNode) {
-//                String userName = item.path("staffNum").asText();
-//                String idCard = item.path("idCard").asText();
-//                String personnelStampNum = item.path("defaultWardId").asText();
-//                String personnelStampNum = item.path("defaultWardName").asText();
-//                String deptName = item.path("defaultDeptName").asText();
-//                String deptCode = item.path("defaultDeptId").asText();
-//                String phonenumber = item.path("telphone").asText();
-//                String nickName = item.path("staffName").asText();
-//                String sex = item.path("staffSex").asText();
-//
-//            }
-//
-//        } catch (IOException e) {
-//            e.printStackTrace();
-//        }
+        String filePath = "C:\\Users\\86176\\Desktop\\鏂板缓鏂囨湰鏂囨。 4.txt"; // 鏇挎崲涓轰綘鐨勬枃浠惰矾寰�
+
+        try {
+            // 璇诲彇鏂囦欢鍐呭
+            String jsonContent = new String(Files.readAllBytes(Paths.get(filePath)), StandardCharsets.UTF_8);
+
+            // 鍒涘缓ObjectMapper瀵硅薄
+            ObjectMapper objectMapper = new ObjectMapper();
+            // 瑙ｆ瀽JSON涓篔sonNode
+            JsonNode rootNode = objectMapper.readTree(jsonContent);
+            // 鑾峰彇resultList
+            JsonNode resultListNode = rootNode.path("results").path("resultList");
+            // 閬嶅巻resultList涓殑姣忎釜瀵硅薄
+            for (JsonNode item : resultListNode) {
+
+                SysUserImport person = objectMapper.treeToValue(item, SysUserImport.class);
+                person.setStaffPhoto("");
+                sysUserImportMapper.insertSysUserImport(person);
+
+            }
+
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
 
     }
 
@@ -563,7 +562,7 @@
                 patMedInhosp.setLeaveldeptid(thiedInhospInfo.getCurrDeptCode());
                 //濡傛灉鏄嚭闄紝鍏堥�氳繃鎮ｈ�呯紪鍙峰拰娴佹按鍙峰幓鏌ヤ竴涓嬶紝鎮ｈ�呮槸鍚﹀瓨鍦紝濡傛灉瀛樺湪锛屽垯杩涜淇敼
                 PatMedInhosp inhosp = new PatMedInhosp();
-                inhosp.setInhospno(patArchive.getPatientno());
+                inhosp.setPatno(patArchive.getPatientno());
                 inhosp.setSerialnum(patMedInhosp.getSerialnum());
                 List<PatMedInhosp> patMedInhosps = patMedInhospService.selectPatMedInhospList(inhosp);
                 if (CollectionUtils.isNotEmpty(patMedInhosps)) {
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubTaskQueryReq.java b/smartor/src/main/java/com/smartor/domain/ServiceSubTaskQueryReq.java
index 9ea4942..9cdf69f 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubTaskQueryReq.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubTaskQueryReq.java
@@ -45,4 +45,9 @@
     @ApiModelProperty(value = "棰樼洰ID")
     private Long scriptid;
 
+    /**
+     * 鏄惁瀹屾垚
+     */
+    private Boolean isFinish = true;
+
 }
diff --git a/smartor/src/main/java/com/smartor/domain/SysUserImport.java b/smartor/src/main/java/com/smartor/domain/SysUserImport.java
new file mode 100644
index 0000000..9545b29
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/domain/SysUserImport.java
@@ -0,0 +1,330 @@
+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;
+
+/**
+ * 鐢ㄦ埛淇℃伅瀵硅薄 sys_user_import
+ *
+ * @author lihu
+ * @date 2024-09-23
+ */
+@Data
+@ApiModel("鐢ㄦ埛淇℃伅Import")
+public class SysUserImport 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 String subId;
+    private String wards;
+    private String defaultHisWardId;
+    private String defaultWardName;
+    private String openId;
+
+    private String defaultWardId;
+    private String caUpdateTime;
+    private String caPic;
+    private String sort;
+
+    /**
+     * 閮ㄩ棬缂栧彿
+     */
+    @ApiModelProperty("閮ㄩ棬缂栧彿")
+    @Excel(name = "閮ㄩ棬缂栧彿")
+    private String hisStaffId;
+
+    /**
+     * 閮ㄩ棬鍚嶇О
+     */
+    @ApiModelProperty("閮ㄩ棬鍚嶇О")
+    @Excel(name = "閮ㄩ棬鍚嶇О")
+    private String personnelStampNum;
+
+    /**
+     * 鐢ㄦ埛璐﹀彿
+     */
+    @ApiModelProperty("鐢ㄦ埛璐﹀彿")
+    @Excel(name = "鐢ㄦ埛璐﹀彿")
+    private String idCard;
+
+    /**
+     * 鐢ㄦ埛鏄电О
+     */
+    @ApiModelProperty("鐢ㄦ埛鏄电О")
+    @Excel(name = "鐢ㄦ埛鏄电О")
+    private String staffPhoto;
+
+    /**
+     * 鐢ㄦ埛绫诲瀷锛�00绯荤粺鐢ㄦ埛锛�
+     */
+    @ApiModelProperty("鐢ㄦ埛绫诲瀷锛�00绯荤粺鐢ㄦ埛锛�")
+    @Excel(name = "鐢ㄦ埛绫诲瀷", readConverterExp = "0=0绯荤粺鐢ㄦ埛")
+    private String effectiveStart;
+
+    /**
+     * 鎮ｈ�呰寖鍥达細0鍏ㄩ儴锛�1鍖荤敓銆�2鎶ゅ＋銆�9鏃�
+     */
+    @ApiModelProperty("鎮ｈ�呰寖鍥达細0鍏ㄩ儴锛�1鍖荤敓銆�2鎶ゅ＋銆�9鏃�")
+    @Excel(name = "鎮ｈ�呰寖鍥达細0鍏ㄩ儴锛�1鍖荤敓銆�2鎶ゅ＋銆�9鏃�")
+    private String personnelProfile;
+
+    /**
+     * 鑱岀О
+     */
+    @ApiModelProperty("鑱岀О")
+    @Excel(name = "鑱岀О")
+    private String staffNation;
+
+    /**
+     * 宀椾綅
+     */
+    @ApiModelProperty("宀椾綅")
+    @Excel(name = "宀椾綅")
+    private String staffNum;
+
+    /**
+     * 鐢ㄦ埛閭
+     */
+    @ApiModelProperty("鐢ㄦ埛閭")
+    @Excel(name = "鐢ㄦ埛閭")
+    private String effectiveEnd;
+
+    /**
+     * 鎵嬫満鍙风爜
+     */
+    @ApiModelProperty("鎵嬫満鍙风爜")
+    @Excel(name = "鎵嬫満鍙风爜")
+    private String insuranceCode;
+
+    /**
+     * 鐢ㄦ埛鎬у埆锛�0鐢� 1濂� 2鏈煡锛�
+     */
+    @ApiModelProperty("鐢ㄦ埛鎬у埆锛�0鐢� 1濂� 2鏈煡锛�")
+    @Excel(name = "鐢ㄦ埛鎬у埆", readConverterExp = "0=鐢�,1=濂�,2=鏈煡")
+    private String searchCode3;
+
+    /**
+     * 澶村儚鍦板潃
+     */
+    @ApiModelProperty("澶村儚鍦板潃")
+    @Excel(name = "澶村儚鍦板潃")
+    private String searchCode2;
+
+    /**
+     * 瀵嗙爜
+     */
+    @ApiModelProperty("瀵嗙爜")
+    @Excel(name = "瀵嗙爜")
+    private String searchCode1;
+
+    /**
+     * 甯愬彿鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
+     */
+    @ApiModelProperty("甯愬彿鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�")
+    @Excel(name = "甯愬彿鐘舵��", readConverterExp = "0=姝ｅ父,1=鍋滅敤")
+    private String hospitalId;
+
+    /**
+     * 鍒犻櫎鏍囧織锛�0锛氭湭鍒犻櫎 1锛氬凡鍒犻櫎锛�
+     */
+    @ApiModelProperty("鍒犻櫎鏍囧織锛�0锛氭湭鍒犻櫎 1锛氬凡鍒犻櫎锛�")
+    @Excel(name = "鍒犻櫎鏍囧織", readConverterExp = "0=锛氭湭鍒犻櫎,1=锛氬凡鍒犻櫎")
+    private String preUpdater;
+
+    /**
+     * 鏈�鍚庣櫥褰旾P
+     */
+    @ApiModelProperty("鏈�鍚庣櫥褰旾P")
+    @Excel(name = "鏈�鍚庣櫥褰旾P")
+    private String staffName;
+
+    /**
+     * 鏈�鍚庣櫥褰曟椂闂�
+     */
+    @ApiModelProperty("鏈�鍚庣櫥褰曟椂闂�")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "鏈�鍚庣櫥褰曟椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private String defaultDeptName;
+
+    /**
+     * 鍒涘缓鑰�
+     */
+    @ApiModelProperty("鍒涘缓鑰�")
+    @Excel(name = "鍒涘缓鑰�")
+    private String state;
+
+    /**
+     * 鍒涘缓鏃堕棿
+     */
+    @ApiModelProperty("鍒涘缓鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "鍒涘缓鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private String famousDoctorRank;
+
+    /**
+     * 鏇存柊鑰�
+     */
+    @ApiModelProperty("鏇存柊鑰�")
+    @Excel(name = "鏇存柊鑰�")
+    private String firstWorkDate;
+
+    /**
+     * 鏇存柊鏃堕棿
+     */
+    @ApiModelProperty("鏇存柊鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "鏇存柊鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private String preUpdaterNum;
+
+    /**
+     * 澶囨敞
+     */
+    @ApiModelProperty("澶囨敞")
+    @Excel(name = "澶囨敞")
+    private String staffStatus;
+
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty("$column.columnComment")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String mgrPosiCode;
+
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty("$column.columnComment")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String defaultHisDeptId;
+
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty("$column.columnComment")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String staffSex;
+
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty("$column.columnComment")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String staffType;
+
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty("$column.columnComment")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String userId;
+
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty("$column.columnComment")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String preUpdateTime;
+
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty("$column.columnComment")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String famousDoctorRankName;
+
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty("$column.columnComment")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String personnelBirthday;
+
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty("$column.columnComment")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String staffTitle;
+
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty("$column.columnComment")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String signPic;
+
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty("$column.columnComment")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String telphone;
+
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty("$column.columnComment")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String employPostCode;
+
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty("$column.columnComment")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String defaultDeptId;
+
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty("$column.columnComment")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String depts;
+
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty("$column.columnComment")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String staffId;
+
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty("$column.columnComment")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String staffLevel;
+
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty("$column.columnComment")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String selfCollectDialecticalFees;
+
+    /**
+     * $column.columnComment
+     */
+    @ApiModelProperty("$column.columnComment")
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+    private String subIds;
+
+}
+
diff --git a/smartor/src/main/java/com/smartor/mapper/SysUserImportMapper.java b/smartor/src/main/java/com/smartor/mapper/SysUserImportMapper.java
new file mode 100644
index 0000000..a67a550
--- /dev/null
+++ b/smartor/src/main/java/com/smartor/mapper/SysUserImportMapper.java
@@ -0,0 +1,63 @@
+package com.smartor.mapper;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import com.smartor.domain.SysUserImport;
+
+/**
+ * 鐢ㄦ埛淇℃伅Mapper鎺ュ彛
+ *
+ * @author lihu
+ * @date 2024-09-23
+ */
+@Mapper
+public interface SysUserImportMapper
+{
+    /**
+     * 鏌ヨ鐢ㄦ埛淇℃伅
+     *
+     * @param id 鐢ㄦ埛淇℃伅涓婚敭
+     * @return 鐢ㄦ埛淇℃伅
+     */
+    public SysUserImport selectSysUserImportById(Long id);
+
+    /**
+     * 鏌ヨ鐢ㄦ埛淇℃伅鍒楄〃
+     *
+     * @param sysUserImport 鐢ㄦ埛淇℃伅
+     * @return 鐢ㄦ埛淇℃伅闆嗗悎
+     */
+    public List<SysUserImport> selectSysUserImportList(SysUserImport sysUserImport);
+
+    /**
+     * 鏂板鐢ㄦ埛淇℃伅
+     *
+     * @param sysUserImport 鐢ㄦ埛淇℃伅
+     * @return 缁撴灉
+     */
+    public int insertSysUserImport(SysUserImport sysUserImport);
+
+    /**
+     * 淇敼鐢ㄦ埛淇℃伅
+     *
+     * @param sysUserImport 鐢ㄦ埛淇℃伅
+     * @return 缁撴灉
+     */
+    public int updateSysUserImport(SysUserImport sysUserImport);
+
+    /**
+     * 鍒犻櫎鐢ㄦ埛淇℃伅
+     *
+     * @param id 鐢ㄦ埛淇℃伅涓婚敭
+     * @return 缁撴灉
+     */
+    public int deleteSysUserImportById(Long id);
+
+    /**
+     * 鎵归噺鍒犻櫎鐢ㄦ埛淇℃伅
+     *
+     * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+     * @return 缁撴灉
+     */
+    public int deleteSysUserImportByIds(Long[] ids);
+}
diff --git a/smartor/src/main/java/com/smartor/service/IServiceTaskService.java b/smartor/src/main/java/com/smartor/service/IServiceTaskService.java
index fb07d63..03968a7 100644
--- a/smartor/src/main/java/com/smartor/service/IServiceTaskService.java
+++ b/smartor/src/main/java/com/smartor/service/IServiceTaskService.java
@@ -68,7 +68,7 @@
      * @param patid
      * @return
      */
-    public Map<String, Object> getScriptInfoByCondition(Long taskid, Long patid);
+    public Map<String, Object> getScriptInfoByCondition(Long taskid, Long patid,Boolean isFinish);
 
 
 }
diff --git a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
index b9522e6..9a3ea25 100644
--- a/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -183,6 +183,7 @@
     public int deletePatMedInhospByInhospid(Long inhospid) {
         return patMedInhospMapper.deletePatMedInhospByInhospid(inhospid);
     }
+
     /**
      * 鍒犻櫎鎮ｈ�呬綇闄㈣褰曚俊鎭�
      *
@@ -325,26 +326,53 @@
             serviceSubtask.setServiceType("2");
             serviceSubtask.setServiceform(serviceTask.getPreachform());
             serviceSubtask.setHospType("2");
+            serviceSubtask.setCreateTime(new Date());
+            serviceSubtask.setUpdateTime(new Date());
+            serviceSubtask.setCreateBy(patMedInhosp1.getNurseName());
             serviceSubtask.setLeavehospitaldistrictcode(patMedInhosp1.getLeavehospitaldistrictcode());
             serviceSubtask.setLeavehospitaldistrictname(patMedInhosp1.getLeavehospitaldistrictname());
             //璁剧疆鍙戦�佹椂闂�
             Date newDate = addDays(patMedInhosp1.getEndtime(), stt.getSendDay());
             serviceSubtask.setLongSendTime(newDate);
             //鎮ｈ�呭彂閫佹椂闂�
-            if (StringUtils.isNotEmpty(remark)) {
-                serviceSubtask.setSendstate(4L);
+            if (StringUtils.isNotEmpty(patArchive.getNotrequiredFlag()) && patArchive.getNotrequiredFlag().equals("1")) {
+                remark = patArchive.getNotrequiredreason();
                 serviceSubtask.setRemark(remark);
                 serviceSubtask.setResult("error");
                 serviceSubtask.setFinishtime(new Date());
                 //涓嶆墽琛�
                 serviceSubtask.setSendstate(4L);
-            } else if (patArchive.getNotrequiredFlag().equals("4")) {
-                //浜轰笉鍦ㄤ簡锛屾垨鑰呭叾瀹冨師鍥狅紝涔熶笉鑳介殢璁�
-                serviceSubtask.setSendstate(4L);
-                serviceSubtask.setRemark(patArchive.getNotrequiredreason());
-                serviceSubtask.setResult("error");
-                serviceSubtask.setFinishtime(new Date());
             }
+
+            //鍦ㄦ柊澧炰箣鍓嶏紝鍏堥�氳繃鎮ｈ�匢D锛宻endstate=2鏌ヨ涓�涓嬶紝鍦ㄦ墍鏈夐暱鏈熶换鍔′腑锛屾槸涓嶆槸杩樻湁璇ユ偅鑰呭緟鎵ц鐨勪换鍔★紝鏈夌殑璇�,姣旇緝涔嬪墠鐨別ndtime鏄惁灏忎簬褰撳墠鐨別ndtaime,濡傛灉涔嬪墠鐨勫皬浜庣幇鍦ㄧ殑锛屽垯鐩存帴灏嗕箣鍓嶇殑鍋滄帀锛堝師鍥犲啀鍏ラ櫌锛�
+            ServiceSubtaskVO subtask = new ServiceSubtaskVO();
+            subtask.setPatid(patArchive.getId());
+            subtask.setSendstate(2L);
+            List<ServiceSubtask> selectServiceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(subtask);
+            log.error("璇ユ偅鑰呭緟鎵ц鐨勪换鍔�:{}", selectServiceSubtaskList);
+            if (CollectionUtils.isNotEmpty(selectServiceSubtaskList) && selectServiceSubtaskList.size() > 0) {
+                for (ServiceSubtask serviceSubtask1 : selectServiceSubtaskList) {
+                    if (Objects.isNull(serviceSubtask1.getLongSendTime())) {
+                        //涓嶆槸闀挎湡浠诲姟锛屼笉澶勭悊
+                        continue;
+                    }
+                    if (serviceSubtask1.getEndtime().before(serviceSubtask.getEndtime())) {
+                        //濡傛灉褰撳墠寰幆鐨勫瓙浠诲姟鐨勫嚭闄㈡椂闂村湪鈥滃噯澶囨柊澧炵殑瀛愪换鍔♀�濈殑鍑洪櫌鏃堕棿涔嬪墠锛屽垯灏嗗惊鐜殑瀛愪换鍔″仠鎺�
+                        serviceSubtask1.setSendstate(4L);
+                        serviceSubtask1.setRemark("鎮ｈ�呭啀鍏ラ櫌");
+                        serviceSubtask1.setResult("error");
+                        serviceSubtask1.setFinishtime(new Date());
+                        serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
+                    } else {
+                        //鐩稿弽,鍒欏皢褰撴湁鐨勬暟鎹仠鎺�
+                        serviceSubtask.setResult("error");
+                        serviceSubtask.setFinishtime(new Date());
+                        serviceSubtask.setSendstate(4L);
+                        serviceSubtask.setRemark("鎮ｈ�呭啀鍏ラ櫌");
+                    }
+                }
+            }
+
             serviceSubtaskMapper.insertServiceSubtask(serviceSubtask);
             //灏哻heck_flag鏀规垚1锛堝凡澶勭悊锛�
             PatMedInhosp patMedInhosp2 = new PatMedInhosp();
@@ -352,6 +380,41 @@
             patMedInhosp2.setCheckFlag("1");
             patMedInhospMapper.updatePatMedInhosp(patMedInhosp2);
         }
+
+        //鑾峰彇鏈鐞嗗湪闄㈢殑鏁版嵁(濡傛灉鍒氬垰鍑洪櫌鐨勬偅鑰呮暟鎹殑鍑洪櫌鏃堕棿,鍦ㄤ笅闈㈡煡璇㈠嚭鐨勫叆闄㈡椂闂翠箣鍓�,閭ｄ箣鍓嶇殑鍑洪櫌鎮ｈ�呯殑鏁版嵁,涔熷緱鍋滄帀,鍥犱负鍙堝叆闄簡)
+        patMedInhosp.setCheckFlag("0");
+        patMedInhosp.setInhospstate("0");
+        List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp);
+        if (CollectionUtils.isNotEmpty(patMedInhospList) && patMedInhospList.size() > 0) {
+            for (PatMedInhosp patMedInhosp1 : patMedInhospList) {
+                //鑾峰彇褰撳墠鍏ラ櫌鎮ｈ�呯殑寰呮墽琛岀殑鍑洪櫌瀛愪换鍔￠殢璁夸俊鎭�
+                ServiceSubtaskVO subtask = new ServiceSubtaskVO();
+                subtask.setPatid(patMedInhosp1.getPatid());
+                subtask.setSendstate(2L);
+                List<ServiceSubtask> selectServiceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(subtask);
+                log.error("鍏ラ櫌鐨勬偅鑰呭緟鎵ц鐨勪换鍔�:{}", selectServiceSubtaskList);
+                if (CollectionUtils.isNotEmpty(selectServiceSubtaskList) && selectServiceSubtaskList.size() > 0) {
+                    for (ServiceSubtask serviceSubtask1 : selectServiceSubtaskList) {
+                        if (Objects.isNull(serviceSubtask1.getLongSendTime())) {
+                            //涓嶆槸闀挎湡浠诲姟锛屼笉澶勭悊
+                            continue;
+                        }
+                        if (serviceSubtask1.getEndtime().before(patMedInhosp1.getStarttime())) {
+                            //濡傛灉褰撳墠寰幆鐨勫瓙浠诲姟鐨勫嚭闄㈡椂闂村湪鈥滃噯澶囨柊澧炵殑瀛愪换鍔♀�濈殑鍑洪櫌鏃堕棿涔嬪墠锛屽垯灏嗗惊鐜殑瀛愪换鍔″仠鎺�
+                            serviceSubtask1.setSendstate(4L);
+                            serviceSubtask1.setRemark("鎮ｈ�呭啀鍏ラ櫌");
+                            serviceSubtask1.setResult("error");
+                            serviceSubtask1.setFinishtime(new Date());
+                            serviceSubtaskMapper.updateServiceSubtask(serviceSubtask1);
+                        }
+                    }
+                }
+                //灏嗘偅鍏ョ殑鍏ラ櫌鏁版嵁璁剧疆涓哄凡澶勭悊
+                patMedInhosp1.setCheckFlag("1");
+                patMedInhospMapper.updatePatMedInhosp(patMedInhosp1);
+            }
+        }
+
         return 1;
     }
 
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
index a6832fe..6b27a89 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
@@ -247,7 +247,7 @@
         log.error("selectPatQuesTionResult鐨勫叆鍙備负锛歿}", serviceSubTaskQueryReq);
         Map<String, Object> map = new HashMap<>();
 
-        Map<String, Object> scriptInfoByCondition = serviceTaskService.getScriptInfoByCondition(serviceSubTaskQueryReq.getTaskid(), serviceSubTaskQueryReq.getPatid());
+        Map<String, Object> scriptInfoByCondition = serviceTaskService.getScriptInfoByCondition(serviceSubTaskQueryReq.getTaskid(), serviceSubTaskQueryReq.getPatid(), serviceSubTaskQueryReq.getIsFinish());
         if (scriptInfoByCondition.get("type").equals("1")) {
             List<IvrLibaTemplateScriptVO> ivrLibaTemplateScriptVOList = (List) scriptInfoByCondition.get("script");
             for (IvrLibaTemplateScriptVO ivrLibaTemplateScriptVO : ivrLibaTemplateScriptVOList) {
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
index a318547..87c043d 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceTaskServiceImpl.java
@@ -147,7 +147,7 @@
     }
 
     @Override
-    public Map<String, Object> getScriptInfoByCondition(Long taskid, Long patid) {
+    public Map<String, Object> getScriptInfoByCondition(Long taskid, Long patid, Boolean isFinish) {
         Map<String, Object> map = new HashMap<>();
         ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO();
         serviceSubtaskVO.setPatid(patid);
@@ -169,10 +169,10 @@
             info = sfInfo(serviceTask, patid);
         } else if (serviceTask.getType().equals("2")) {
             //闂嵎
-            info = wjInfo(serviceTask, patid);
+            info = wjInfo(serviceTask, patid, isFinish);
         } else {
             //瀹ｆ暀
-            info = xjInfo(Long.valueOf(serviceTask.getLibtemplateid()), taskid, patid);
+            info = xjInfo(Long.valueOf(serviceTask.getLibtemplateid()), taskid, patid,isFinish);
         }
 
         //鍙鎵撳紑浜嗛〉闈紝灏辩畻鎴愬姛
@@ -262,14 +262,15 @@
      * @param patid
      * @return
      */
-    private List wjInfo(ServiceTask serviceTask, Long patid) {
+    private List wjInfo(ServiceTask serviceTask, Long patid, Boolean isFinish) {
         //鐢ㄦ埛鐐瑰嚮浜嗗閾撅紝灏辩畻浠栭鍙栦簡
-        ServiceSubtask serviceSubtask = new ServiceSubtask();
-        serviceSubtask.setSendstate(1L);
-        serviceSubtask.setPatid(patid);
-        serviceSubtask.setTaskid(serviceTask.getTaskid());
-        serviceSubtaskMapper.updateServiceSubtaskByPatId(serviceSubtask);
-
+        if (isFinish == true) {
+            ServiceSubtask serviceSubtask = new ServiceSubtask();
+            serviceSubtask.setSendstate(1L);
+            serviceSubtask.setPatid(patid);
+            serviceSubtask.setTaskid(serviceTask.getTaskid());
+            serviceSubtaskMapper.updateServiceSubtaskByPatId(serviceSubtask);
+        }
         //閫氳繃妯℃澘ID鑾峰彇闂淇℃伅
         SvyLibTemplateScript svyLibTemplateScript = new SvyLibTemplateScript();
         svyLibTemplateScript.setSvyid(Long.valueOf(serviceTask.getLibtemplateid()));
@@ -325,13 +326,15 @@
         return svyLibTemplateScriptVOS;
     }
 
-    private List xjInfo(Long templateId, Long taskid, Long patid) {
-        ServiceSubtask serviceSubtask = new ServiceSubtask();
-        serviceSubtask.setTaskid(taskid);
-        serviceSubtask.setPatid(patid);
-        serviceSubtask.setResult("瀹屾垚");
-        serviceSubtask.setFinishtime(new Date());
-        serviceSubtaskMapper.updateServiceSubtaskByCondition(serviceSubtask);
+    private List xjInfo(Long templateId, Long taskid, Long patid, Boolean isFinish) {
+        if (isFinish == true) {
+            ServiceSubtask serviceSubtask = new ServiceSubtask();
+            serviceSubtask.setTaskid(taskid);
+            serviceSubtask.setPatid(patid);
+            serviceSubtask.setResult("瀹屾垚");
+            serviceSubtask.setFinishtime(new Date());
+            serviceSubtaskMapper.updateServiceSubtaskByCondition(serviceSubtask);
+        }
         HeLibrary heLibrary = heLibraryMapper.selectHeLibraryById(Long.valueOf(templateId));
         List list = new ArrayList();
         list.add(heLibrary);
diff --git a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
index 766679f..ad48259 100644
--- a/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
@@ -500,26 +500,14 @@
             <if test="deptname != null and deptname != ''">
                 AND d.deptname LIKE concat('%',#{deptname}, '%')
             </if>
-            <if test="leavehospitaldistrictcodes != null and leaveldeptcodes != null">
-                AND (d.leavehospitaldistrictcode IN
-                <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="(" separator=","
-                         close=")">
-                    #{leavehospitaldistrictcode}
-                </foreach>
-                OR d.leaveldeptcode IN
-                <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
-                         close="))">
-                    #{leaveldeptcode}
-                </foreach>
-            </if>
-            <if test="leavehospitaldistrictcodes != null and leaveldeptcodes == null">
+            <if test="leavehospitaldistrictcodes != null">
                 AND d.leavehospitaldistrictcode IN
                 <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="(" separator=","
                          close=")">
                     #{leavehospitaldistrictcode}
                 </foreach>
             </if>
-            <if test="leavehospitaldistrictcodes == null and leaveldeptcodes != null">
+            <if test="leaveldeptcodes != null">
                 AND d.leaveldeptcode IN
                 <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
                          close=")">
diff --git a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
index 854773c..52c1d4a 100644
--- a/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
@@ -198,31 +198,20 @@
             <if test="leaveldeptname != null  and leaveldeptname != ''">and b.leaveldeptname like concat('%',
                 #{leaveldeptname}, '%')
             </if>
-               <if test="patid != null  and patid != ''">and a.id =#{patid}
+            <if test="patid != null  and patid != ''">and a.id =#{patid}
             </if>
             <if test="leavehospitaldistrictname != null  and leavehospitaldistrictname != ''">and
                 b.leavehospitaldistrictname like concat('%', #{leavehospitaldistrictname}, '%')
             </if>
-            <if test="leavehospitaldistrictcodes != null and leaveldeptcodes != null">
-                AND (b.leavehospitaldistrictcode IN
-                <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="(" separator=","
-                         close=")">
-                    #{leavehospitaldistrictcode}
-                </foreach>
-                OR b.leaveldeptcode IN
-                <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
-                         close="))">
-                    #{leaveldeptcode}
-                </foreach>
-            </if>
-            <if test="leavehospitaldistrictcodes != null and leaveldeptcodes == null">
+
+            <if test="leavehospitaldistrictcodes != null">
                 AND b.leavehospitaldistrictcode IN
                 <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="(" separator=","
                          close=")">
                     #{leavehospitaldistrictcode}
                 </foreach>
             </if>
-            <if test="leavehospitaldistrictcodes == null and leaveldeptcodes != null">
+            <if test="leaveldeptcodes != null">
                 AND b.leaveldeptcode IN
                 <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
                          close=")">
@@ -311,26 +300,14 @@
                 #{leavediagname}, '%')
             </if>
             <if test="drname != null  and drname != ''">and b.drname like concat('%', #{drname}, '%')</if>
-            <if test="leavehospitaldistrictcodes != null and leaveldeptcodes != null">
-                AND (b.leavehospitaldistrictcode IN
-                <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="(" separator=","
-                         close=")">
-                    #{leavehospitaldistrictcode}
-                </foreach>
-                OR b.leaveldeptcode IN
-                <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
-                         close="))">
-                    #{leaveldeptcode}
-                </foreach>
-            </if>
-            <if test="leavehospitaldistrictcodes != null and leaveldeptcodes == null">
+            <if test="leavehospitaldistrictcodes != null ">
                 AND b.leavehospitaldistrictcode IN
                 <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="(" separator=","
                          close=")">
                     #{leavehospitaldistrictcode}
                 </foreach>
             </if>
-            <if test="leavehospitaldistrictcodes == null and leaveldeptcodes != null">
+            <if test="leaveldeptcodes != null">
                 AND b.leaveldeptcode IN
                 <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
                          close=")">
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 5775111..4084d2b 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -178,26 +178,14 @@
             <if test="templatename != null  and templatename != ''">and templatename like concat('%', #{templatename},
                 '%')
             </if>
-            <if test="leavehospitaldistrictcodes != null and leaveldeptcodes != null">
-                AND leavehospitaldistrictcode IN
-                <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="(" separator=","
-                         close=")">
-                    #{leavehospitaldistrictcode}
-                </foreach>
-                OR deptcode IN
-                <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
-                         close=")">
-                    #{leaveldeptcode}
-                </foreach>
-            </if>
-            <if test="leavehospitaldistrictcodes != null and leaveldeptcodes == null">
+            <if test="leavehospitaldistrictcodes != null">
                 AND leavehospitaldistrictcode IN
                 <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="(" separator=","
                          close=")">
                     #{leavehospitaldistrictcode}
                 </foreach>
             </if>
-            <if test="leavehospitaldistrictcodes == null and leaveldeptcodes != null">
+            <if test=" leaveldeptcodes != null">
                 AND deptcode IN
                 <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
                          close=")">
diff --git a/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
index 65a6411..167731b 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
@@ -146,26 +146,15 @@
             <if test="sendState != null  ">and send_state = #{sendState}</if>
             <if test="leavehospitaldistrictname != null  ">and leavehospitaldistrictname = #{leavehospitaldistrictname}</if>
             <if test="leavehospitaldistrictcode != null  ">and leavehospitaldistrictcode = #{leavehospitaldistrictcode}</if>
-            <if test="leavehospitaldistrictcodes != null and leaveldeptcodes != null">
-                AND (leavehospitaldistrictcode IN
-                <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="(" separator=","
-                         close=")">
-                    #{leavehospitaldistrictcode}
-                </foreach>
-                OR deptcode IN
-                <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
-                         close="))">
-                    #{leaveldeptcode}
-                </foreach>
-            </if>
-            <if test="leavehospitaldistrictcodes != null and leaveldeptcodes == null">
+
+            <if test="leavehospitaldistrictcodes != null ">
                 AND leavehospitaldistrictcode IN
                 <foreach collection="leavehospitaldistrictcodes" item="leavehospitaldistrictcode" open="(" separator=","
                          close=")">
                     #{leavehospitaldistrictcode}
                 </foreach>
             </if>
-            <if test="leavehospitaldistrictcodes == null and leaveldeptcodes != null">
+            <if test="leaveldeptcodes != null">
                 AND deptcode IN
                 <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","
                          close=")">
diff --git a/smartor/src/main/resources/mapper/smartor/SysUserImportMapper.xml b/smartor/src/main/resources/mapper/smartor/SysUserImportMapper.xml
new file mode 100644
index 0000000..800ee7a
--- /dev/null
+++ b/smartor/src/main/resources/mapper/smartor/SysUserImportMapper.xml
@@ -0,0 +1,621 @@
+<?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.SysUserImportMapper">
+
+    <resultMap type="com.smartor.domain.SysUserImport" id="SysUserImportResult">
+        <result property="id" column="id"/>
+        <result property="subId" column="sub_id"/>
+        <result property="caUpdateTime" column="caUpdateTime"/>
+        <result property="wards" column="wards"/>
+        <result property="hisStaffId" column="his_staff_id"/>
+        <result property="personnelStampNum" column="personnel_stamp_num"/>
+        <result property="idCard" column="id_card"/>
+        <result property="staffPhoto" column="staff_photo"/>
+        <result property="effectiveStart" column="effective_start"/>
+        <result property="personnelProfile" column="personnel_profile"/>
+        <result property="staffNation" column="staff_nation"/>
+        <result property="staffNum" column="staff_num"/>
+        <result property="effectiveEnd" column="effective_end"/>
+        <result property="insuranceCode" column="insurance_code"/>
+        <result property="searchCode3" column="search_code3"/>
+        <result property="searchCode2" column="search_code2"/>
+        <result property="searchCode1" column="search_code1"/>
+        <result property="hospitalId" column="hospital_id"/>
+        <result property="preUpdater" column="pre_updater"/>
+        <result property="staffName" column="staff_name"/>
+        <result property="defaultDeptName" column="default_dept_name"/>
+        <result property="state" column="state"/>
+        <result property="famousDoctorRank" column="famous_doctor_rank"/>
+        <result property="firstWorkDate" column="first_work_date"/>
+        <result property="preUpdaterNum" column="pre_updater_num"/>
+        <result property="staffStatus" column="staff_status"/>
+        <result property="mgrPosiCode" column="mgr_posi_code"/>
+        <result property="defaultHisDeptId" column="default_his_dept_id"/>
+        <result property="defaultWardId" column="default_ward_id"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="staffSex" column="staff_sex"/>
+        <result property="staffType" column="staff_type"/>
+        <result property="userId" column="user_id"/>
+        <result property="preUpdateTime" column="pre_update_time"/>
+        <result property="famousDoctorRankName" column="famous_doctor_rank_name"/>
+        <result property="personnelBirthday" column="personnel_birthday"/>
+        <result property="staffTitle" column="staff_title"/>
+        <result property="signPic" column="sign_pic"/>
+        <result property="createTime" column="create_time"/>
+        <result property="telphone" column="telphone"/>
+        <result property="employPostCode" column="employ_post_code"/>
+        <result property="defaultDeptId" column="default_dept_id"/>
+        <result property="depts" column="depts"/>
+        <result property="staffId" column="staff_id"/>
+        <result property="staffLevel" column="staff_level"/>
+        <result property="selfCollectDialecticalFees" column="self_collect_dialectical_fees"/>
+        <result property="subIds" column="sub_ids"/>
+        <result property="defaultHisWardId" column="default_his_ward_id"/>
+        <result property="defaultWardName" column="default_ward_name"/>
+        <result property="openId" column="open_id"/>
+    </resultMap>
+
+    <sql id="selectSysUserImportVo">
+        select id,
+               sub_id,
+               default_his_ward_id,
+               default_ward_name,
+               his_staff_id,
+               default_ward_id,
+               personnel_stamp_num,
+               id_card,
+               staff_photo,
+               effective_start,
+               personnel_profile,
+               staff_nation,
+               staff_num,
+               effective_end,
+               insurance_code,
+               search_code3,
+               search_code2,
+               search_code1,
+               hospital_id,
+               pre_updater,
+               staff_name,
+               default_dept_name,
+               state,
+               famous_doctor_rank,
+               first_work_date,
+               pre_updater_num,
+               staff_status,
+               mgr_posi_code,
+               default_his_deptId,
+               update_time,
+               staff_sex,
+               staff_type,
+               user_id,
+               pre_update_time,
+               famous_doctor_rank_name,
+               personnel_birthday,
+               staff_title,
+               sign_pic,
+               open_id,
+               create_time,
+               telphone,
+               employ_post_code,
+               default_dept_id,
+               depts,
+               staff_id,
+               staff_level,
+               self_collect_dialectical_fees,
+               sub_ids
+        from sys_user_import
+    </sql>
+
+    <select id="selectSysUserImportList" parameterType="com.smartor.domain.SysUserImport"
+            resultMap="SysUserImportResult">
+        <include refid="selectSysUserImportVo"/>
+        <where>
+            <if test="subId != null ">
+                and sub_id = #{subId}
+            </if>
+            <if test="hisStaffId != null  and hisStaffId != ''">
+                and his_staff_id = #{hisStaffId}
+            </if>
+            <if test="personnelStampNum != null  and personnelStampNum != ''">
+                and personnel_stamp_num = #{personnelStampNum}
+            </if>
+            <if test="idCard != null  and idCard != ''">
+                and id_card = #{idCard}
+            </if>
+            <if test="defaultWardId != null  and defaultWardId != ''">
+                and default_ward_id = #{defaultWardId}
+            </if>
+            <if test="staffPhoto != null  and staffPhoto != ''">
+                and staff_photo = #{staffPhoto}
+            </if>
+            <if test="effectiveStart != null  and effectiveStart != ''">
+                and effective_start = #{effectiveStart}
+            </if>
+            <if test="personnelProfile != null  and personnelProfile != ''">
+                and personnel_profile = #{personnelProfile}
+            </if>
+            <if test="staffNation != null  and staffNation != ''">
+                and staff_nation = #{staffNation}
+            </if>
+            <if test="staffNum != null  and staffNum != ''">
+                and staff_num = #{staffNum}
+            </if>
+            <if test="effectiveEnd != null  and effectiveEnd != ''">
+                and effective_end = #{effectiveEnd}
+            </if>
+            <if test="insuranceCode != null  and insuranceCode != ''">
+                and insurance_code = #{insuranceCode}
+            </if>
+            <if test="searchCode3 != null  and searchCode3 != ''">
+                and search_code3 = #{searchCode3}
+            </if>
+            <if test="searchCode2 != null  and searchCode2 != ''">
+                and search_code2 = #{searchCode2}
+            </if>
+            <if test="searchCode1 != null  and searchCode1 != ''">
+                and search_code1 = #{searchCode1}
+            </if>
+            <if test="hospitalId != null  and hospitalId != ''">
+                and hospital_id = #{hospitalId}
+            </if>
+            <if test="preUpdater != null  and preUpdater != ''">
+                and pre_updater = #{preUpdater}
+            </if>
+            <if test="staffName != null  and staffName != ''">
+                and staff_name like concat('%', #{staffName}, '%')
+            </if>
+            <if test="defaultDeptName != null ">
+                and default_dept_name like concat('%', #{defaultDeptName}, '%')
+            </if>
+            <if test="state != null  and state != ''">
+                and state = #{state}
+            </if>
+            <if test="famousDoctorRank != null ">
+                and famous_doctor_rank = #{famousDoctorRank}
+            </if>
+            <if test="firstWorkDate != null  and firstWorkDate != ''">
+                and first_work_date = #{firstWorkDate}
+            </if>
+            <if test="preUpdaterNum != null ">
+                and pre_updater_num = #{preUpdaterNum}
+            </if>
+            <if test="staffStatus != null  and staffStatus != ''">
+                and staff_status = #{staffStatus}
+            </if>
+            <if test="mgrPosiCode != null  and mgrPosiCode != ''">
+                and mgr_posi_code = #{mgrPosiCode}
+            </if>
+            <if test="defaultHisDeptId != null  and defaultHisDeptId != ''">
+                and default_his_dept_id = #{defaultHisDeptId}
+            </if>
+            <if test="staffSex != null  and staffSex != ''">
+                and staff_sex = #{staffSex}
+            </if>
+            <if test="staffType != null  and staffType != ''">
+                and staff_type = #{staffType}
+            </if>
+            <if test="userId != null ">
+                and user_id = #{userId}
+            </if>
+            <if test="preUpdateTime != null ">
+                and pre_update_time = #{preUpdateTime}
+            </if>
+            <if test="famousDoctorRankName != null  and famousDoctorRankName != ''">
+                and famous_doctor_rank_name like concat('%', #{famousDoctorRankName}, '%')
+            </if>
+            <if test="personnelBirthday != null  and personnelBirthday != ''">
+                and personnel_birthday = #{personnelBirthday}
+            </if>
+            <if test="staffTitle != null  and staffTitle != ''">
+                and staff_title = #{staffTitle}
+            </if>
+            <if test="signPic != null  and signPic != ''">
+                and sign_pic = #{signPic}
+            </if>
+            <if test="telphone != null  and telphone != ''">
+                and telphone = #{telphone}
+            </if>
+            <if test="employPostCode != null  and employPostCode != ''">
+                and employ_post_code = #{employPostCode}
+            </if>
+            <if test="defaultDeptId != null ">
+                and default_dept_id = #{defaultDeptId}
+            </if>
+            <if test="depts != null  and depts != ''">
+                and depts = #{depts}
+            </if>
+            <if test="staffId != null ">
+                and staff_id = #{staffId}
+            </if>
+            <if test="staffLevel != null  and staffLevel != ''">
+                and staff_level = #{staffLevel}
+            </if>
+            <if test="selfCollectDialecticalFees != null  and selfCollectDialecticalFees != ''">
+                and self_collect_dialectical_fees = #{selfCollectDialecticalFees}
+            </if>
+            <if test="subIds != null  and subIds != ''">
+                and sub_ids = #{subIds}
+            </if>
+            <if test="defaultHisWardId != null  and defaultHisWardId != ''">
+                and default_his_ward_id = #{defaultHisWardId}
+            </if>
+            <if test="defaultWardName != null  and defaultWardName != ''">
+                and default_ward_name = #{defaultWardName}
+            </if>
+        </where>
+    </select>
+
+    <select id="selectSysUserImportById" parameterType="Long"
+            resultMap="SysUserImportResult">
+        <include refid="selectSysUserImportVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertSysUserImport" parameterType="com.smartor.domain.SysUserImport" useGeneratedKeys="true"
+            keyProperty="id">
+        insert into sys_user_import
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="subId != null">sub_id,
+            </if>
+            <if test="hisStaffId != null">his_staff_id,
+            </if>
+            <if test="personnelStampNum != null">personnel_stamp_num,
+            </if>
+            <if test="idCard != null and idCard != ''">id_card,
+            </if>
+            <if test="staffPhoto != null and staffPhoto != ''">staff_photo,
+            </if>
+            <if test="effectiveStart != null">effective_start,
+            </if>
+            <if test="personnelProfile != null and personnelProfile != ''">personnel_profile,
+            </if>
+            <if test="staffNation != null">staff_nation,
+            </if>
+            <if test="staffNum != null">staff_num,
+            </if>
+            <if test="effectiveEnd != null">effective_end,
+            </if>
+            <if test="insuranceCode != null">insurance_code,
+            </if>
+            <if test="searchCode3 != null">search_code3,
+            </if>
+            <if test="searchCode2 != null">search_code2,
+            </if>
+            <if test="searchCode1 != null">search_code1,
+            </if>
+            <if test="hospitalId != null">hospital_id,
+            </if>
+            <if test="preUpdater != null">pre_updater,
+            </if>
+            <if test="staffName != null">staff_name,
+            </if>
+            <if test="defaultDeptName != null">default_dept_name,
+            </if>
+            <if test="state != null">state,
+            </if>
+            <if test="famousDoctorRank != null">famous_doctor_rank,
+            </if>
+            <if test="firstWorkDate != null">first_work_date,
+            </if>
+            <if test="preUpdaterNum != null">pre_updater_num,
+            </if>
+            <if test="staffStatus != null">staff_status,
+            </if>
+            <if test="mgrPosiCode != null">mgr_posi_code,
+            </if>
+            <if test="defaultHisDeptId != null">default_his_dept_id,
+            </if>
+            <if test="updateTime != null">update_time,
+            </if>
+            <if test="staffSex != null">staff_sex,
+            </if>
+            <if test="staffType != null">staff_type,
+            </if>
+            <if test="userId != null">user_id,
+            </if>
+            <if test="preUpdateTime != null">pre_update_time,
+            </if>
+            <if test="famousDoctorRankName != null">famous_doctor_rank_name,
+            </if>
+            <if test="personnelBirthday != null">personnel_birthday,
+            </if>
+            <if test="staffTitle != null">staff_title,
+            </if>
+            <if test="createTime != null">create_time,
+            </if>
+            <if test="telphone != null">telphone,
+            </if>
+            <if test="employPostCode != null">employ_post_code,
+            </if>
+            <if test="defaultDeptId != null">default_dept_id,
+            </if>
+            <if test="depts != null">depts,
+            </if>
+            <if test="staffId != null">staff_id,
+            </if>
+            <if test="staffLevel != null">staff_level,
+            </if>
+            <if test="selfCollectDialecticalFees != null">self_collect_dialectical_fees,
+            </if>
+            <if test="subIds != null">sub_ids,
+            </if>
+            <if test="defaultWardId != null">default_ward_id,
+            </if>
+            <if test="defaultHisWardId != null  and defaultHisWardId != ''">
+                default_his_ward_id,
+            </if>
+            <if test="defaultWardName != null  and defaultWardName != ''">
+                default_ward_name,
+            </if>
+            <if test="openId != null  and openId != ''">
+                open_id,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="subId != null">#{subId},
+            </if>
+            <if test="hisStaffId != null">#{hisStaffId},
+            </if>
+            <if test="personnelStampNum != null">#{personnelStampNum},
+            </if>
+            <if test="idCard != null and idCard != ''">#{idCard},
+            </if>
+            <if test="staffPhoto != null and staffPhoto != ''">#{staffPhoto},
+            </if>
+            <if test="effectiveStart != null">#{effectiveStart},
+            </if>
+            <if test="personnelProfile != null and personnelProfile != ''">#{personnelProfile},
+            </if>
+            <if test="staffNation != null">#{staffNation},
+            </if>
+            <if test="staffNum != null">#{staffNum},
+            </if>
+            <if test="effectiveEnd != null">#{effectiveEnd},
+            </if>
+            <if test="insuranceCode != null">#{insuranceCode},
+            </if>
+            <if test="searchCode3 != null">#{searchCode3},
+            </if>
+            <if test="searchCode2 != null">#{searchCode2},
+            </if>
+            <if test="searchCode1 != null">#{searchCode1},
+            </if>
+            <if test="hospitalId != null">#{hospitalId},
+            </if>
+            <if test="preUpdater != null">#{preUpdater},
+            </if>
+            <if test="staffName != null">#{staffName},
+            </if>
+            <if test="defaultDeptName != null">#{defaultDeptName},
+            </if>
+            <if test="state != null">#{state},
+            </if>
+            <if test="famousDoctorRank != null">#{famousDoctorRank},
+            </if>
+            <if test="firstWorkDate != null">#{firstWorkDate},
+            </if>
+            <if test="preUpdaterNum != null">#{preUpdaterNum},
+            </if>
+            <if test="staffStatus != null">#{staffStatus},
+            </if>
+            <if test="mgrPosiCode != null">#{mgrPosiCode},
+            </if>
+            <if test="defaultHisDeptId != null">#{defaultHisDeptId},
+            </if>
+            <if test="updateTime != null">#{updateTime},
+            </if>
+            <if test="staffSex != null">#{staffSex},
+            </if>
+            <if test="staffType != null">#{staffType},
+            </if>
+            <if test="userId != null">#{userId},
+            </if>
+            <if test="preUpdateTime != null">#{preUpdateTime},
+            </if>
+            <if test="famousDoctorRankName != null">#{famousDoctorRankName},
+            </if>
+            <if test="personnelBirthday != null">#{personnelBirthday},
+            </if>
+            <if test="staffTitle != null">#{staffTitle},
+            </if>
+            <if test="createTime != null">#{createTime},
+            </if>
+            <if test="telphone != null">#{telphone},
+            </if>
+            <if test="employPostCode != null">#{employPostCode},
+            </if>
+            <if test="defaultDeptId != null">#{defaultDeptId},
+            </if>
+            <if test="depts != null">#{depts},
+            </if>
+            <if test="staffId != null">#{staffId},
+            </if>
+            <if test="staffLevel != null">#{staffLevel},
+            </if>
+            <if test="selfCollectDialecticalFees != null">#{selfCollectDialecticalFees},
+            </if>
+            <if test="subIds != null">#{subIds},
+            </if>
+            <if test="defaultWardId != null">#{defaultWardId},
+            </if>
+            <if test="defaultHisWardId != null  and defaultHisWardId != ''">
+                #{defaultHisWardId},
+            </if>
+            <if test="defaultWardName != null  and defaultWardName != ''">
+                #{defaultWardName},
+            </if>
+            <if test="openId != null  and openId != ''">
+                #{openId},
+            </if>
+        </trim>
+    </insert>
+
+    <update id="updateSysUserImport" parameterType="com.smartor.domain.SysUserImport">
+        update sys_user_import
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="subId != null">sub_id =
+                #{subId},
+            </if>
+            <if test="hisStaffId != null">his_staff_id =
+                #{hisStaffId},
+            </if>
+            <if test="personnelStampNum != null">personnel_stamp_num =
+                #{personnelStampNum},
+            </if>
+            <if test="idCard != null and idCard != ''">id_card =
+                #{idCard},
+            </if>
+            <if test="staffPhoto != null and staffPhoto != ''">staff_photo =
+                #{staffPhoto},
+            </if>
+            <if test="effectiveStart != null">effective_start =
+                #{effectiveStart},
+            </if>
+            <if test="personnelProfile != null and personnelProfile != ''">personnel_profile =
+                #{personnelProfile},
+            </if>
+            <if test="staffNation != null">staff_nation =
+                #{staffNation},
+            </if>
+            <if test="staffNum != null">staff_num =
+                #{staffNum},
+            </if>
+            <if test="effectiveEnd != null">effective_end =
+                #{effectiveEnd},
+            </if>
+            <if test="insuranceCode != null">insurance_code =
+                #{insuranceCode},
+            </if>
+            <if test="searchCode3 != null">search_code3 =
+                #{searchCode3},
+            </if>
+            <if test="searchCode2 != null">search_code2 =
+                #{searchCode2},
+            </if>
+            <if test="searchCode1 != null">search_code1 =
+                #{searchCode1},
+            </if>
+            <if test="hospitalId != null">hospital_id =
+                #{hospitalId},
+            </if>
+            <if test="preUpdater != null">pre_updater =
+                #{preUpdater},
+            </if>
+            <if test="staffName != null">staff_name =
+                #{staffName},
+            </if>
+            <if test="defaultDeptName != null">default_dept_name =
+                #{defaultDeptName},
+            </if>
+            <if test="state != null">state =
+                #{state},
+            </if>
+            <if test="famousDoctorRank != null">famous_doctor_rank =
+                #{famousDoctorRank},
+            </if>
+            <if test="firstWorkDate != null">first_work_date =
+                #{firstWorkDate},
+            </if>
+            <if test="preUpdaterNum != null">pre_updater_num =
+                #{preUpdaterNum},
+            </if>
+            <if test="staffStatus != null">staff_status =
+                #{staffStatus},
+            </if>
+            <if test="mgrPosiCode != null">mgr_posi_code =
+                #{mgrPosiCode},
+            </if>
+            <if test="defaultHisDeptId != null">default_his_dept_id =
+                #{defaultHisDeptId},
+            </if>
+            <if test="updateTime != null">update_time =
+                #{updateTime},
+            </if>
+            <if test="staffSex != null">staff_sex =
+                #{staffSex},
+            </if>
+            <if test="staffType != null">staff_type =
+                #{staffType},
+            </if>
+            <if test="userId != null">user_id =
+                #{userId},
+            </if>
+            <if test="preUpdateTime != null">pre_update_time =
+                #{preUpdateTime},
+            </if>
+            <if test="famousDoctorRankName != null">famous_doctor_rank_name =
+                #{famousDoctorRankName},
+            </if>
+            <if test="personnelBirthday != null">personnel_birthday =
+                #{personnelBirthday},
+            </if>
+            <if test="staffTitle != null">staff_title =
+                #{staffTitle},
+            </if>
+            <if test="signPic != null">sign_pic =
+                #{signPic},
+            </if>
+            <if test="createTime != null">create_time =
+                #{createTime},
+            </if>
+            <if test="telphone != null">telphone =
+                #{telphone},
+            </if>
+            <if test="employPostCode != null">employ_post_code =
+                #{employPostCode},
+            </if>
+            <if test="defaultDeptId != null">default_dept_id =
+                #{defaultDeptId},
+            </if>
+            <if test="depts != null">depts =
+                #{depts},
+            </if>
+            <if test="staffId != null">staff_id =
+                #{staffId},
+            </if>
+            <if test="staffLevel != null">staff_level =
+                #{staffLevel},
+            </if>
+            <if test="selfCollectDialecticalFees != null">self_collect_dialectical_fees =
+                #{selfCollectDialecticalFees},
+            </if>
+            <if test="subIds != null">sub_ids =
+                #{subIds},
+            </if>
+            <if test="defaultWardId != null  and defaultWardId != ''">
+                default_ward_id = #{defaultWardId},
+            </if>
+            <if test="defaultHisWardId != null  and defaultHisWardId != ''">
+                default_his_ward_id = #{defaultHisWardId},
+            </if>
+            <if test="defaultWardName != null  and defaultWardName != ''">
+                default_ward_name = #{defaultWardName,
+            </if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteSysUserImportById" parameterType="Long">
+        update sys_user_import
+        <trim prefix="SET" suffixOverrides=",">
+            del_flag =1
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteSysUserImportByIds" parameterType="String">
+        update sys_user_import
+        <trim prefix="SET" suffixOverrides=",">
+            del_flag =1
+        </trim>
+        where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
+
+</mapper>

--
Gitblit v1.9.3