From 1f621896865039d53ef8cae4766f24d4884e9845 Mon Sep 17 00:00:00 2001
From: linjj <850658129@qq.com>
Date: Tue, 1 Aug 2023 11:23:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=AF=A6=E6=83=85=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E5=8C=BB=E7=94=9F=E3=80=81=E6=8A=A4=E5=A3=AB=E4=BC=98?=
 =?UTF-8?q?=E5=85=88=E6=98=BE=E7=A4=BA=E7=94=B5=E5=AD=90=E7=97=85=E5=8E=86?=
 =?UTF-8?q?=E3=80=81=E6=8A=A4=E7=90=86=E6=96=87=E4=B9=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/emr/service/ipml/Archive_MasterServiceImpl.java   | 8 +-------
 src/main/resources/mapper/Archive_MasterMapper.xml        | 6 +++---
 .../webapp/WEB-INF/views/dictionaryDir/dictionary.jsp     | 1 -
 .../webapp/static/js/lastVerifyList/lastVerifyList.js     | 3 +--
 4 files changed, 5 insertions(+), 13 deletions(-)

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 ccd7e03..f52ca40 100644
--- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
+++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
@@ -1236,14 +1236,12 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
         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(list.getSex());
             commomVo.setAdmissId(list.getId());
-            String substring = list.getSubAssort().substring(0, 2);
-            commomVo.setAge(substring);
+            commomVo.setAge(list.getSubAssort());
             DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
             Date date1=null;
             Date date2=null;
@@ -1262,10 +1260,6 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
             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());
diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml
index fde6765..80aa3d1 100644
--- a/src/main/resources/mapper/Archive_MasterMapper.xml
+++ b/src/main/resources/mapper/Archive_MasterMapper.xml
@@ -1759,10 +1759,10 @@
 
     <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
+        select archive_master.*,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
+        where archive_master.id in
         <foreach item="item" collection="ids.split(',')" open="(" separator="," close=")">
             #{item}
         </foreach>
diff --git a/src/main/webapp/WEB-INF/views/dictionaryDir/dictionary.jsp b/src/main/webapp/WEB-INF/views/dictionaryDir/dictionary.jsp
index 8540fc0..6ff0226 100644
--- a/src/main/webapp/WEB-INF/views/dictionaryDir/dictionary.jsp
+++ b/src/main/webapp/WEB-INF/views/dictionaryDir/dictionary.jsp
@@ -851,7 +851,6 @@
         });
 
         $("#saveBtn").click(function () {
-            debugger
             var entity = getEntity();
             var zTree = $.fn.zTree.getZTreeObj("ztree");
             if (entity.id != "") {
diff --git a/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js b/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js
index 863bdd5..9ac3140 100644
--- a/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js
+++ b/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js
@@ -430,7 +430,6 @@ $("#verifyBtn").on('click', function () {
         var ids = $("#archiveId").val();
         //只有一个直接提交
         //获取柜子列个数
-        debugger
         var paperPostionValueLength = $("#paperPostionValueLength").val();
         if(paperPostionValueLength >= 1){
             for(var i = 1;i<=paperPostionValueLength;i++) {
@@ -521,7 +520,7 @@ function approveMethod(){
     $.ajax({
         url: path+"/lastVerify/updateStateByArchivId",
         type: "POST",
-        data: {id: $("#archiveId").val(), remark: $("#verifyText").val(),changeReason:$("#changeReason").val(),checkedDatetime:$("#checkedDateTime").val(),status:128,formToken:$("#formToken").val(),
+        data: {id: $("#archiveId").val(), remark: $("#verifyText").val(),changeReason:$("#changeReason").val(),checkedDatetime:$("#checkedDateTime").val(),status:$("#status1").val(),formToken:$("#formToken").val(),
             paperPosition:paperPosition,
             paperPosition1:paperPosition1,
             paperPosition2:paperPosition2,