From a233d5b92158713f3d50394ebf0d631ce30b5c51 Mon Sep 17 00:00:00 2001
From: linjj <850658129@qq.com>
Date: Wed, 21 Jun 2023 16:32:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=81=E5=AD=98=E7=97=85=E6=A1=88=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../emr/controller/signListController.java    |  2 +-
 .../ipml/Archive_MasterServiceImpl.java       | 23 +++++++++++++++
 .../resources/mapper/Archive_MasterMapper.xml | 28 ++-----------------
 .../views/beHospitaledDir/beHospList.jsp      |  2 +-
 4 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/src/main/java/com/emr/controller/signListController.java b/src/main/java/com/emr/controller/signListController.java
index 73fcb7ad..3fbb641f 100644
--- a/src/main/java/com/emr/controller/signListController.java
+++ b/src/main/java/com/emr/controller/signListController.java
@@ -876,7 +876,7 @@ public class signListController {
         patientIds.add(id);
         collectionVo.setPatientIds(patientIds);
         collectionVo.setSysCodes(flagNum);
-        String url="http://192.168.16.63:9295/api/NoViewCollect/generateTaskByPatientIdAndSysCodes";
+        String url="http://10.6.1.127:9295/api/NoViewCollect/generateTaskByPatientIdAndSysCodes";
         JSONObject jsonParam= (JSONObject) JSONObject.toJSON(collectionVo);
         JSONObject jsonObject = httpPost(url, jsonParam);
         //查询新任务表id
diff --git a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
index 0e2d315a..22267a68 100644
--- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
+++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
@@ -104,6 +104,11 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
     public List<Archive_Master> selectByCol(Archive_Master_Vo archiveMasterVo) {
         List<Archive_Master> list=archiveMasterMapper.selectByCol(archiveMasterVo);
         if(list!=null && list.size()>0) {
+            Emr_Dictionary dic = new Emr_Dictionary();
+            dic.setEffective(1);
+            dic.setTypecode("dept_code");
+            //科室列表
+            List<Emr_Dictionary> dicList = emrDictionaryService.dicByTypeCode(dic);
             JSONArray powerUsers = powerUserService.getPowerUserList("1");
             List<JSONObject> powerUserList = JSONArray.parseArray(powerUsers.toJSONString(), JSONObject.class);
             if (powerUserList != null) {
@@ -127,6 +132,24 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
                     } else {
                         archiveMaster.setNurseName(userInfo.getString("name"));
                     }
+
+                    //替换科室
+                    for (int k = 0; k < dicList.size(); k++) {
+                        String deptName = archiveMaster.getDeptName();
+                        //入院科室dept_admission_to
+                        String dept2 = archiveMaster.getDeptAdmissionTo();
+
+                        if ((deptName != null && deptName.equals(dicList.get(k).getCode()))) {
+                            //出院科室
+                            deptName = deptName.replace(deptName, dicList.get(k).getName());
+                            archiveMaster.setDeptName(deptName);
+                        }
+                        if (dept2 != null && dept2.equals(dicList.get(k).getCode())) {
+                            //入院科室
+                            dept2 = dept2.replace(dept2, dicList.get(k).getName());
+                            archiveMaster.setDeptAdmissionTo(dept2);
+                        }
+                    }
                 }
             }
         }
diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml
index 41ee2beb..4f3a53e4 100644
--- a/src/main/resources/mapper/Archive_MasterMapper.xml
+++ b/src/main/resources/mapper/Archive_MasterMapper.xml
@@ -170,20 +170,12 @@
         </if>
     </select>
     <select id="selectByCol" parameterType="com.emr.entity.Archive_Master_Vo" resultMap="BaseResultMap">
-        select distinct m.id,m.patient_id,m.inp_no,m.cmt_doctor,m.cmt_nurse,m.visit_id,m.name,m.sex,ISNULL(f.name, m.dept_name) dept_name
+        select distinct m.id,m.patient_id,m.inp_no,m.cmt_doctor,m.cmt_nurse,m.visit_id,m.name,m.sex,m.dept_name
         ,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time
-        ,ISNULL(d.name,m.dept_admission_to) dept_admission_to,m.check_doctor,m.doctor_name,m.nurse_name,m.checked_datetime,m.checked_doctor
+        ,m.dept_admission_to,m.check_doctor,m.doctor_name,m.nurse_name,m.checked_datetime,m.checked_doctor
         ,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned,m.is_scanning,bed_number
-        ,ISNULL(printTable.num, 0) printNum
+        ,ISNULL(m.print_flag, 0) printNum
         from archive_master m
-        LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
-        typeCode='dept_code' ))d
-        on m.dept_admission_to=d.code
-        LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
-        typeCode='dept_code' )) f
-        on m.dept_name=f.code
-        LEFT JOIN (select MasterID,COUNT(*) num from archive_printInfo group by MasterID) printTable
-        on m.id=printTable.MasterID
         where 1=1
         and patindex('%B%',m.inp_no) = 0 and inp_no not like 'LG%' and  m.Is_Valid!=1
         <if test="deptAdmissionTo!= null and deptAdmissionTo!= ''">
@@ -1749,21 +1741,7 @@
             from archive_master  where 1=1 and ArchiveState not in('作废','已封存','取消入院') and Is_Valid!=1
         ) m
         on f.master_id=m.master_id
---         LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where typeCode='dept_code' )) c
---         on m.dept_name=c.code
---
---         LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where typeCode='dept_code' )) e
---         on m.dept_admission_to=e.code
         <where> 1=1 and m.master_id!='' and m.master_id is not null
-            <!--<if test="(overdueDaysTwo != null and overdueDaysTwo != '') ">-->
-                <!--and-->
-                <!--DATEDIFF(dd,(SELECT max(b.date)-->
-                <!--FROM (select top 4 date from emr_holiday_set where date >= CONVERT (-->
-                <!--VARCHAR (10),-->
-                <!--m.discharge_date_time,-->
-                <!--120-->
-                <!--) and flag= 1 order by date asc) as b), CONVERT(VARCHAR(20),f.handle_time,23)) >=#{overdueDaysTwo,jdbcType=NCHAR}-->
-            <!--</if>-->
             <if test="id != null and id != ''">
                 and m.id = #{id,jdbcType=NVARCHAR}
             </if>
diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
index 4f64c2a7..71b117bc 100644
--- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
+++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
@@ -3847,7 +3847,7 @@
                             var html = "";
                             if (index != null && index != "") {
                                 if (index.indexOf("select") != -1) {
-                                    html = html + '<button type="button" class="btn btn-danger btn-sm selInfo" >查看</button>';// '<a href="javascript:;" class="delete">删除</a>';
+                                    html = html + '<button type="button" class="btn btn-danger btn-sm selInfo" onclick="initTable2()">查看</button>';// '<a href="javascript:;" class="delete">删除</a>';
 
                                 }
                                 if (index.indexOf("first") != -1) {