人员新增信息维护，和电子病历sql查询

src/main/java/thyyxxk/webserver/dao/his/settings/SettingsDao.java

@@ -91,7 +91,7 @@ public interface SettingsDao {
             "                                                                   where zy_part_time_dept.dept_code = zd_unit_code.code) " +
             "                                                     from zy_part_time_dept " +
             "                                                     where zy_part_time_dept.code = a.code " +
-            "                                                     for xml path('')), 1, 1, '') " +
+            "                                                     for xml path('')), 1, 1, ''), doctor_zy, doctor_yp_zl " +
             "from a_employee_mi a  " +
             " ${ew.customSqlSegment} ")
     IPage<UserInfo> selectAllUsers(IPage<UserInfo> page,

src/main/java/thyyxxk/webserver/entity/login/UserInfo.java

@@ -167,6 +167,13 @@ public class UserInfo {
 
     private String userConfig;
 
+    @ColumnName
+    private Integer doctorZy;
+
+    @ColumnName
+    private Integer doctorYpZl;
+    private String doctorYpZlName;
+
     public JSONObject getUserConfigJson() {
         return StringUtil.isBlank(userConfig) ? new JSONObject() : JSONObject.parseObject(userConfig);
     }

src/main/java/thyyxxk/webserver/service/PublicServer.java

@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.AllArgsConstructor;
+import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.ListUtils;
 import org.apache.ibatis.session.ExecutorType;
@@ -737,6 +739,13 @@ public class PublicServer {
         return ResultVoUtil.success(list);
     }
 
+    @Data
+    @AllArgsConstructor
+    public static class IntCodeName {
+        private Integer code;
+        private String name;
+    }
+
     public ResultVo<Map<String, Object>> getPeopleToFillInInformation() throws InvocationTargetException, IllegalAccessException {
         Map<String, Object> map = new HashMap<>(Capacity.EIGHT);
         map.put("restrictedDrugLevels", EnumToJson.toJson(RestrictedDrugLevels.values()));
@@ -747,6 +756,13 @@ public class PublicServer {
         map.put("zdIfcadre", dao.getZdIfcadre());
         map.put("zdEmpTitle", dao.getZdEmpTitle());
         map.put("mzyZdChargeType", dao.getMzyZdChargeType());
+
+        List<IntCodeName> list = new ArrayList<IntCodeName>() {{
+            add(new IntCodeName(1, "非限制"));
+            add(new IntCodeName(2, "限制"));
+        }};
+
+        map.put("doctorYpZl", list);
         return ResultVoUtil.success(map);
     }
 

src/main/java/thyyxxk/webserver/service/dashboard/DashboardService.java

@@ -12,6 +12,7 @@ import thyyxxk.webserver.utils.DateUtil;
 import thyyxxk.webserver.utils.ResultVoUtil;
 import thyyxxk.webserver.utils.StringUtil;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -47,21 +48,28 @@ public class DashboardService {
         return ResultVoUtil.success(list);
     }
 
+    public static class HuLi {
+
+    }
+
     public ResultVo<JSONObject> selectInpatientBriefsV2(String deptCode) {
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("data", selectInpatientBriefs(deptCode).getData());
         jsonObject.put("bedCount", dao.bedCount(deptCode));
 
-        jsonObject.put("huli", new JSONObject() {{
-            put("病危", dao.criticallyIllCount(deptCode));
-            put("病重", dao.seriouslyIllCount(deptCode));
-            put("一级护理", dao.primaryCare(deptCode));
-            put("二级护理", dao.secondaryCare(deptCode));
-            put("入院人数", dao.admissCount(deptCode));
-            put("出院人数", dao.dischargeCount(deptCode));
-            put("转出人数", dao.outCount(deptCode));
-            put("转入人数", dao.inCount(deptCode));
-        }});
+
+        List<String[]> list = new ArrayList<>();
+
+        list.add(new String[]{"病危", dao.criticallyIllCount(deptCode).toString()});
+        list.add(new String[]{"病重", dao.seriouslyIllCount(deptCode).toString()});
+        list.add(new String[]{"一级护理", dao.primaryCare(deptCode).toString()});
+        list.add(new String[]{"二级护理", dao.secondaryCare(deptCode).toString()});
+        list.add(new String[]{"入院人数", dao.admissCount(deptCode).toString()});
+        list.add(new String[]{"出院人数", dao.dischargeCount(deptCode).toString()});
+        list.add(new String[]{"转出人数", dao.outCount(deptCode).toString()});
+        list.add(new String[]{"转入人数", dao.inCount(deptCode).toString()});
+
+        jsonObject.put("huli", list);
 
         return ResultVoUtil.success(jsonObject);
     }

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/emr/EmrAuditServer.java

@@ -128,6 +128,7 @@ public class EmrAuditServer {
         qw.eq("times", params.getTimes());
         qw.eq("history", 0);
         qw.eq("final_control", params.getFinalControl());
+        qw.isNull("remediation_status");
         return ResultVoUtil.success(dao.selectList(qw));
     }
 

src/main/java/thyyxxk/webserver/utils/SiUtil.java

@@ -2,7 +2,6 @@ package thyyxxk.webserver.utils;
 
 import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
-import net.sourceforge.pinyin4j.PinyinHelper;
 import org.apache.commons.codec.binary.Base64;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;