任务详情根据医生、护士优先显示电子病历、护理文书

src/main/java/com/emr/dao/Archive_MasterMapper.java

@@ -109,4 +109,7 @@ public interface Archive_MasterMapper {
     int insertCommonlyUsed(CommomVo commomVo);
 
     List<Archive_Master> selectCommonlyUsed(Archive_Master record);
+
+
+    List<Archive_Master> selectCommonlyUsedNew(@Param("ids") String ids);
 }

src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java

@@ -11,10 +11,7 @@ import com.emr.dao.*;
 import com.emr.entity.*;
 import com.emr.service.Archive_MasterService;
 import com.emr.service.Emr_Fault_DetailService;
-import com.emr.util.ExceptionPrintUtil;
-import com.emr.util.HttpClientUtils;
-import com.emr.util.Msg;
-import com.emr.util.OracleConnect;
+import com.emr.util.*;
 import com.emr.vo.CommomVo;
 import com.emr.vo.User;
 import com.github.pagehelper.Page;
@@ -1226,54 +1223,55 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
     @Override
     public void updateFiled(Archive_Master_Vo master) throws Exception{
         // 从session获取用户名
+        CommomVo commomVo=new CommomVo();
         String username = (String) SecurityUtils.getSubject().getSession().getAttribute("userSession");//获取前面登录的用户名
         SimpleDateFormat format1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        String ids = master.getId();
-        String[] idList = ids.split(",");
+        String[] idList = master.getId().split(",");
+        String ids = String.join(",", idList);
         List<ArchiveFlowRole> archiveFlowRoles = flowRoleMapper.selectAll();
-        List<Archive_Master> archive_masterVos = archive_masterMapper.selectCommonlyUsed(master);
+        List<Archive_Master> archive_masterVos = archive_masterMapper.selectCommonlyUsedNew(ids);
         if(CollectionUtils.isEmpty(archive_masterVos)){
             return;
         }
-        Archive_Master archive_master_vos = archive_masterVos.get(0);
-        CommomVo commomVo=new CommomVo();
-            commomVo.setPatientId(archive_master_vos.getId());
-            commomVo.setAdmissTimes(archive_master_vos.getVisitId());
-            commomVo.setAdmissId(archive_master_vos.getInpNo());
-            commomVo.setInpatientNo(archive_master_vos.getInpNo());
-            commomVo.setName(archive_master_vos.getName());
+        for (Archive_Master list:archive_masterVos){
+            commomVo.setPatientId(list.getId());
+            commomVo.setAdmissTimes(list.getVisitId());
+            commomVo.setAdmissId(list.getInpNo());
+            commomVo.setInpatientNo(list.getInpNo());
+            commomVo.setName(list.getName());
             commomVo.setCheckedDatetime(format1.format(new Date()));
-            commomVo.setSex(archive_master_vos.getSex());
-            commomVo.setAdmissId(archive_master_vos.getId());
-            String substring = archive_master_vos.getSubAssort().substring(0, 2);
+            commomVo.setSex(list.getSex());
+            commomVo.setAdmissId(list.getId());
+            String substring = list.getSubAssort().substring(0, 2);
             commomVo.setAge(substring);
-        DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
-        Date date1=null;
-        Date date2=null;
-        String dischargeDateTime = archive_master_vos.getDischargeDateTime();
-        String admissionDateTime = archive_master_vos.getAdmissionDateTime();
-        try {
-            date1=format.parse(dischargeDateTime);
-            date2=format.parse(admissionDateTime);
-        } catch (ParseException e) {
-            e.printStackTrace();
+            DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+            Date date1=null;
+            Date date2=null;
+            String dischargeDateTime = list.getDischargeDateTime();
+            String admissionDateTime = list.getAdmissionDateTime();
+            try {
+                date1=format.parse(dischargeDateTime);
+                date2=format.parse(admissionDateTime);
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+            Calendar ca1 = Calendar.getInstance();
+            Calendar ca2 = Calendar.getInstance();
+            ca1.setTime(date1);
+            ca2.setTime(date2);
+            long distanceMin =( ca1.getTimeInMillis()- ca2.getTimeInMillis())/(1000*60*60*24);
+            int i2= (int)distanceMin;
+            commomVo.setAdmissDays(i2);
+            int i = Integer.parseInt(substring);
+            int i1 = i * 12;
+            String s = String.valueOf(i1);
+            commomVo.setAgeMonth(s);
+            commomVo.setAdmissDate(list.getAdmissionDateTime());
+            commomVo.setDisDate(list.getDischargeDateTime());
+            commomVo.setDisDept(list.getDeptName1());
+            commomVo.setAttending(list.getDoctorInCharge());
+            archive_masterMapper.insertCommonlyUsed(commomVo);
         }
-        Calendar ca1 = Calendar.getInstance();
-        Calendar ca2 = Calendar.getInstance();
-        ca1.setTime(date1);
-        ca2.setTime(date2);
-        long distanceMin =( ca1.getTimeInMillis()- ca2.getTimeInMillis())/(1000*60*60*24);
-        int i2= (int)distanceMin;
-        commomVo.setAdmissDays(i2);
-        int i = Integer.parseInt(substring);
-        int i1 = i * 12;
-        String s = String.valueOf(i1);
-        commomVo.setAgeMonth(s);
-            commomVo.setAdmissDate(archive_master_vos.getAdmissionDateTime());
-            commomVo.setDisDate(archive_master_vos.getDischargeDateTime());
-            commomVo.setDisDept(archive_master_vos.getDeptName1());
-            commomVo.setAttending(archive_master_vos.getDoctorInCharge());
-             archive_masterMapper.insertCommonlyUsed(commomVo);
         for(String id : idList) {
             if(StringUtils.isNotBlank(id)) {
                 //修改病案归档状态

src/main/java/com/emr/util/FieldSelector.java

@@ -0,0 +1,12 @@
+package com.emr.util;
+
+/**
+ * @InterfaceName FieldSelector
+ * @Description
+ * @Author linjj
+ * @Date 2023/6/29 16:41
+ * @Version 1.0
+ */
+public interface FieldSelector<Type, FieldType> {
+    FieldType select(Type type);
+}

src/main/java/com/emr/util/ListUtils.java

@@ -0,0 +1,73 @@
+package com.emr.util;
+
+import org.springframework.util.CollectionUtils;
+
+import java.util.*;
+
+public final class ListUtils {
+    public static <T, K> Map<K, T> toMap(List<T> list, FieldSelector<T, K> selector) {
+        if (CollectionUtils.isEmpty(list)) return Collections.emptyMap();
+        Map<K, T> map = new HashMap<>(list.size());
+        for (T t : list) {
+            K key = selector.select(t);
+            if (key != null) map.put(key, t);
+        }
+        return map;
+    }
+
+    public static <T, K> Map<K, List<T>> groupBy(List<T> list, FieldSelector<T, K> selector) {
+        if (CollectionUtils.isEmpty(list)) return Collections.emptyMap();
+        Map<K, List<T>> map = new HashMap<>();
+        for (T t : list) {
+            K key = selector.select(t);
+            if (key == null) continue;
+            if (!map.containsKey(key)) {
+                map.put(key, new ArrayList<T>());
+            }
+            map.get(key).add(t);
+        }
+        return map;
+    }
+
+    public static <T, K> List<K> select(List<T> list, FieldSelector<T, K> selector) {
+        if (CollectionUtils.isEmpty(list)) return Collections.emptyList();
+        List<K> filedList = new ArrayList<>(list.size());
+        for (T t : list) {
+            K key = selector.select(t);
+            if (key != null) filedList.add(key);
+        }
+        return filedList;
+    }
+
+    public static <T, K> List<K> distinctSelect(List<T> list, FieldSelector<T, K> selector) {
+        if (CollectionUtils.isEmpty(list)) return Collections.emptyList();
+        Set<K> filedSet = new HashSet<>();
+        for (T t : list) {
+            K key = selector.select(t);
+            if (key != null) filedSet.add(key);
+        }
+        return new ArrayList<>(filedSet);
+    }
+
+    @SafeVarargs
+    public static <T> List<T> unionWithoutDuplicate(List<T>... values) {
+        if (null == values || values.length <= 0) return Collections.emptyList();
+        Set<T> unionFiledSet = new HashSet<>();
+        for (List<T> value : values) {
+            if (!CollectionUtils.isEmpty(value)) {
+                unionFiledSet.addAll(value);
+            }
+        }
+        return new ArrayList<>(unionFiledSet);
+    }
+
+    public static <T, K> List<T> skipDuplicateKey(List<T> list, FieldSelector<T, K> selector) {
+        if (CollectionUtils.isEmpty(list)) return Collections.emptyList();
+        List<T> filedList = new ArrayList<>(list.size());
+        Map<K, T> map = toMap(list, selector);
+        for (K key : map.keySet()) {
+            filedList.add(map.get(key));
+        }
+        return filedList;
+    }
+}

src/main/resources/config/config.properties

@@ -3,7 +3,7 @@
 #POWER_PORT = 8081
 
 POWER_IP = localhost
-POWER_PORT = 8082
+POWER_PORT = 8083
 
 #power\u6743\u9650\u7CFB\u7EDF\u7684\u670D\u52A1\u5668\u5730\u5740\u5934
 POWER_URLHEAD = http://${POWER_IP}:${POWER_PORT}/power

src/main/resources/config/jdbc.properties

@@ -1,7 +1,7 @@
 #\u6570\u636E\u5E93IP
 dataBaseIp=localhost
 #\u6570\u636E\u5E93\u540D\u79F0
-dataBaseName=fs_record
+dataBaseName=gm_record
 #\u6570\u636E\u5E93\u5BC6\u7801
 dataBasePassword=admin123
 

src/main/resources/mapper/Archive_MasterMapper.xml

@@ -1756,4 +1756,16 @@
          where patient_id=#{patientId}
     </select>
 
+
+    <select id="selectCommonlyUsedNew" resultMap="BaseResultMap"
+            parameterType="java.lang.String">
+        select *,emr_dictionary.Name as deptName1 from  archive_master
+                                                            LEFT JOIN emr_dictionary ON archive_master.dept_name = emr_dictionary. CODE
+            AND emr_dictionary.parent_id = 'dept_code'
+        where patient_id in
+        <foreach item="item" collection="ids.split(',')" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </select>
+
 </mapper>

src/main/webapp/static/js/lastVerifyList/lastVerifyList.js

@@ -521,7 +521,7 @@ function approveMethod(){
     $.ajax({
         url: path+"/lastVerify/updateStateByArchivId",
         type: "POST",
-        data: {id: $("#archiveId").val(), remark: $("#verifyText").val(),changeReason:$("#changeReason").val(),checkedDatetime:$("#checkedDateTime").val(),status:$("#status1").val(),formToken:$("#formToken").val(),
+        data: {id: $("#archiveId").val(), remark: $("#verifyText").val(),changeReason:$("#changeReason").val(),checkedDatetime:$("#checkedDateTime").val(),status:128,formToken:$("#formToken").val(),
             paperPosition:paperPosition,
             paperPosition1:paperPosition1,
             paperPosition2:paperPosition2,