1.修改病历清单查看完整性

2.病案室退回增加退回扫描切换

src/main/java/com/emr/controller/beHospitaledController.java

@@ -194,12 +194,8 @@ public class beHospitaledController {
     @ResponseBody
     @RequestMapping(value = "/checkSuccess")
     private String checkSuccessMethod(String archiveDetailId){
-        //查询完整性
-        Archive_Master archiveMaster = archiveMasterService.selectByPrimaryKey(archiveDetailId);
-        return archiveMaster.getLockinfo();
-        /* String result = "";
+        String result = "";
         String endpoint = HomepageDictionary;
-        //String endpoint = "http://localhost:8080/ca3/services/caSynrochnized?wsdl";
         String method = HomepageMethod;
         JAXDynamicClientFactory factory = JAXDynamicClientFactory.newInstance();
         Client client = null;
@@ -218,12 +214,13 @@ public class beHospitaledController {
         } catch (Exception e) {
             ExceptionPrintUtil.printException(e);
             e.printStackTrace();
+            result = "失败";
         }finally {
             if(null != client){
                 client.destroy();
             }
         }
-        return result;*/
+        return result;
     }
 
 

src/main/java/com/emr/controller/lastVerifyController.java

@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
@@ -177,6 +178,19 @@ public class lastVerifyController {
         return Msg.success().add("ids",ids);
     }
 
+    /**
+     * 退回扫描
+     * @param id
+     * @param backContent
+     * @return
+     * @throws Exception
+     */
+    @ResponseBody
+    @RequestMapping(value = "/updateDetailByArchivIdForBack")
+    public Msg updateDetailByArchivIdForBack(String id,@RequestParam("backContent") String backContent) throws Exception{
+        archiveMasterService.updateDetailByArchivIdForBack(id,backContent);
+        return Msg.success();
+    }
 }
  
 

src/main/java/com/emr/entity/Archive_Master.java

@@ -53,6 +53,16 @@ public class Archive_Master {
 
     private String t1;
 
+    private String c4;
+
+    public String getC4() {
+        return c4;
+    }
+
+    public void setC4(String c4) {
+        this.c4 = c4;
+    }
+
     public String getT1() {
         return t1;
     }

src/main/java/com/emr/service/Archive_MasterService.java

@@ -124,6 +124,8 @@ public interface Archive_MasterService {
 
     List<String> selectOracleGetSignList(StringBuilder patientIdStr, List<String> selectList);
 
+    void updateDetailByArchivIdForBack(String id, String backContent);
+
     //String selectLockInfoByMasterId(String archiveDetailId);
 }
  

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

@@ -1297,10 +1297,14 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
         return selectList;
     }
 
-    /*@Override
-    public String selectLockInfoByMasterId(String archiveDetailId) {
-        return null;
-    }*/
+    @Override
+    public void updateDetailByArchivIdForBack(String id, String backContent) {
+        //设置退回扫描信息
+        Archive_Master archiveMaster = archiveMasterMapper.selectByPrimaryKey(id);
+        archiveMaster.setC4(backContent);
+        archiveMasterMapper.updateById(archiveMaster);
+        //加入日志
+    }
 }
 
 

src/main/resources/config/config.properties

@@ -1,10 +1,10 @@
 #power\u6743\u9650\u7CFB\u7EDFIP\u548C\u7AEF\u53E3
-POWER_IP = localhost
-POWER_PORT = 8081
-
-#POWER_IP = 200.100.104.40
+#POWER_IP = localhost
 #POWER_PORT = 8081
 
+POWER_IP = 200.100.104.40
+POWER_PORT = 8081
+
 #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,16 +1,16 @@
 #\u6570\u636E\u5E93IP
-dataBaseIp=localhost
-#\u6570\u636E\u5E93\u540D\u79F0
-dataBaseName=gm_record
-#\u6570\u636E\u5E93\u5BC6\u7801
-dataBasePassword=docus702
-
-#\u6570\u636E\u5E93IP
-#dataBaseIp=200.100.104.40
+#dataBaseIp=localhost
 ##\u6570\u636E\u5E93\u540D\u79F0
-#dataBaseName=emr_record
+#dataBaseName=gm_record
 ##\u6570\u636E\u5E93\u5BC6\u7801
-#dataBasePassword=AbcXyz123
+#dataBasePassword=docus702
+
+#\u6570\u636E\u5E93IP
+dataBaseIp=200.100.104.40
+#\u6570\u636E\u5E93\u540D\u79F0
+dataBaseName=emr_record
+#\u6570\u636E\u5E93\u5BC6\u7801
+dataBasePassword=AbcXyz123
 
 jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
 jdbc.url=jdbc\:sqlserver\://${dataBaseIp}:1433;databaseName=${dataBaseName}

src/main/resources/mapper/Archive_MasterMapper.xml

@@ -1310,7 +1310,8 @@
       DOCTOR_IN_CHARGE = #{doctorInCharge,jdbcType=NVARCHAR},
       ID_NO = #{idNo,jdbcType=NVARCHAR},
       DISCHARGE_DISPOSITION = #{dischargeDisposition,jdbcType=NVARCHAR},
-      dept_code_lend = #{deptCodeLend,jdbcType=NVARCHAR}
+      dept_code_lend = #{deptCodeLend,jdbcType=NVARCHAR},
+      C4 = #{c4,jdbcType=NVARCHAR}
     where id = #{id,jdbcType=NVARCHAR}
   </update>
 

src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp

@@ -856,7 +856,7 @@
     </div>
 </div>
 </body>
-<script src="${path}/static/js/beHospList/beHospList.js?time=2021-11-24"></script>
-<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2021-08-01"></script>
+<script src="${path}/static/js/beHospList/beHospList.js?time=2021-11-25"></script>
+<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2021-11-25"></script>
 <script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-10-16"></script>
 </html>

src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp

@@ -110,6 +110,9 @@
         .filter-option-inner-inner {
             font-size: 12px;
         }
+        .checkedDiv{
+            cursor: pointer;
+        }
     </style>
     <script>
         var path = "${path}";
@@ -525,49 +528,13 @@
                 </button>
                 <h4 class="modal-title">终审退回信息</h4>
             </div>
-            <div class="modal-body divCss2">
-                <!--通过审批且未过期的patientId集合-->
-                <form class="form-horizontal" id="form2">
-                    <div class="row">
-                        <input id="backArchiveId" hidden>
-                        <input id="status" type="hidden">
-                        <input type="hidden" name="formToken" id="formToken1">
-                        <div class="row divCss3">缺陷信息</div>
-                        <div class="row divCss2">
-                            <div class="row divCss2">
-                                <span style="float:left;vertical-align:top;">选项：</span>
-                                <div style="float:left;" id="faultTypeDiv">
-                                </div>
-
-                            </div>
-                            <div class="row divCss2">
-                                <span style="vertical-align:top;">内容：</span><textarea id="content" rows="6" cols="80"
-                                                                                      maxlength="500"></textarea>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="divCss4"></div>
-                    <div class="row">
-                        <div class="row divCss3 ">退回信息</div>
-                        <div class="row divCss2">
-                            <div class="row divCss2">
-                                <span style="vertical-align:center;">评分：</span><input id="score" type="number"
-                                                                                      class="input-sm " min="1"/> 分
-                            </div>
-                            <div class="row divCss22">
-                                <span>退给角色：</span>
-                                <label><input type="checkbox" name="returntoRole" class="returntoRole" value="DOCTOR"/>医生</label>
-                                <label><input type="checkbox" name="returntoRole" class="returntoRole" value="NURSE"/>护士</label>
-                            </div>
-                            <div class="row divCss2">
-                                <span style="vertical-align:top;">内容：</span><textarea id="backContent" rows="6"
-                                                                                      cols="80"
-                                                                                      maxlength="500"></textarea>
-                            </div>
-                        </div>
-                    </div>
-                </form>
+            <input id="backArchiveId" hidden>
+            <input id="status" type="hidden">
+            <input id="backInfoFlag" type="hidden">
+            <input type="hidden" name="formToken" id="formToken1">
+            <div class="modal-body divCss2" id="backInfo">
+                <div id="backChecked"></div>
+                <div id="backInfoForm"></div>
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-default btn-sm" data-dismiss="modal">返回</button>
@@ -687,8 +654,8 @@
     </div>
 </div>
 </body>
-<script src="${path}/static/js/lastVerifyList/lastVerifyList.js?time=2021-10-29"></script>
-<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2021-08-01"></script>
+<script src="${path}/static/js/lastVerifyList/lastVerifyList.js?time=2021-11-24"></script>
+<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2021-11-24"></script>
 <script src="${path}/static/js/statistics/getDeptCommom.js"></script>
 <script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-10-16"></script>
 </html>

src/main/webapp/static/js/beHospList/beHospList.js

@@ -874,7 +874,7 @@ $("#excelBtn").click(function () {
 $("#checkSuccessBtn").click(function(){
     var masterId = $("#masterId").val();
     var result = checkSuccessMethod(masterId);
-    if(result != ''){
+    if(result != '失败'){
         $("#wzContent").text(result);
         //增加完整性刷新后高亮状态
         $("#wzContent").addClass("wzContent");

src/main/webapp/static/js/hospitalCommom/hospitalCommom.js

@@ -97,47 +97,19 @@ function returnInfo(status,targetCode,id){
 
 //提交退回信息
 $("#returnBtn").on('click', function () {
-    //退给角色选中个数
-    var returnRoleLength = $("input[name='returntoRole']:checked").length;
-    if(returnRoleLength == 0){
-        toastr.warning("退给角色至少选中一个!");
-        return;
-    }
-    if (validateNum($("#score").val()) && $("#backArchiveId").val() != "") {
-        var data = {};
-        data.archiveDetailId = $("#backArchiveId").val();
-        //缺陷信息
-        data.content = $("#content").val();
-        //选择框checkbox,选中的id
-        data.assortId = "";
-        //jquery获取复选框值
-        var arr = [];
-        $('input[name="Fruit"]:checked').each(function () {//遍历每一个名字为interest的复选框，其中选中的执行函数
-            arr.push($(this).val())//将选中的值添加到数组arr中
-        });
-        if (arr != []) {
-            data.assortId = arr.toString();
+    var backInfoFlag = $("#backInfoFlag").val();
+    //backInfoFlag,2:扫描退回；1:审核退回
+    if(backInfoFlag == 2){
+        var backContent = $("#backContent").val();
+        if(backContent == ''){
+            toastr.warning('退回内容不能为空');
+            return;
         }
-        //退回信息
-        data.score = $("#score").val();
-        var length = $('input[name="returntoRole"]:checked').length;
-        if(length == 2){
-            //退给角色,如果选中两个存ALL
-            data.returntoRole = 'ALL';
-        }else{
-            $('input[name="returntoRole"]:checked').each(function () {//遍历每一个名字为interest的复选框，其中选中的执行函数
-                data.returntoRole = $(this).val();
-            });
-        }
-        data.backContent = $("#backContent").val();
-        data.status = $("#status").val();
-        data.formToken = $("#formToken1").val();
-        data.targetCode = $("#targetCode").val();
         //根据病案号保存缺陷信息
         $.ajax({
-            url: path+"/lastVerify/updateDetailByArchivId",
+            url: path+"/lastVerify/updateDetailByArchivIdForBack",
             type: "POST",
-            data: data,
+            data: {"id":$("#backArchiveId").val(),"backContent":$("#backContent").val()},
             success: function (result) {
                 if (result.code == 100) {
                     //关闭modal
@@ -150,8 +122,63 @@ $("#returnBtn").on('click', function () {
                 }
             }
         });
-    } else {
-        toastr.warning("评分范围0-100！");
+    }else{
+        //退给角色选中个数
+        var returnRoleLength = $("input[name='returntoRole']:checked").length;
+        if(returnRoleLength == 0){
+            toastr.warning("退给角色至少选中一个!");
+            return;
+        }
+        if (validateNum($("#score").val()) && $("#backArchiveId").val() != "") {
+            var data = {};
+            data.archiveDetailId = $("#backArchiveId").val();
+            //缺陷信息
+            data.content = $("#content").val();
+            //选择框checkbox,选中的id
+            data.assortId = "";
+            //jquery获取复选框值
+            var arr = [];
+            $('input[name="Fruit"]:checked').each(function () {//遍历每一个名字为interest的复选框，其中选中的执行函数
+                arr.push($(this).val())//将选中的值添加到数组arr中
+            });
+            if (arr != []) {
+                data.assortId = arr.toString();
+            }
+            //退回信息
+            data.score = $("#score").val();
+            var length = $('input[name="returntoRole"]:checked').length;
+            if(length == 2){
+                //退给角色,如果选中两个存ALL
+                data.returntoRole = 'ALL';
+            }else{
+                $('input[name="returntoRole"]:checked').each(function () {//遍历每一个名字为interest的复选框，其中选中的执行函数
+                    data.returntoRole = $(this).val();
+                });
+            }
+            data.backContent = $("#backContent").val();
+            data.status = $("#status").val();
+            data.formToken = $("#formToken1").val();
+            data.targetCode = $("#targetCode").val();
+            //根据病案号保存缺陷信息
+            $.ajax({
+                url: path+"/lastVerify/updateDetailByArchivId",
+                type: "POST",
+                data: data,
+                success: function (result) {
+                    if (result.code == 100) {
+                        //关闭modal
+                        $('#returnModal').modal('hide');  //手动关闭
+                        toastr.success("退回成功！");
+                        //刷新
+                        $('#table').bootstrapTable('refresh');
+                    } else {
+                        toastr.error(result.msg);
+                    }
+                }
+            });
+        } else {
+            toastr.warning("评分范围0-100！");
+        }
     }
 });
 

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

@@ -237,21 +237,9 @@ function initTable() {
                     },
                     events: {
                         'click .returnInfo': function (e, value, row, index) {
-                            setFormToken();
-                            //console.log("=====退回======");
                             $("#backArchiveId").val(row.id);
                             $("#status").val(row.archivestate);
-                            $('#form2').find('input,textarea,checkbox').prop('readonly', false);
-                            $('#returnBtn').show();
-                            //清空标签的内容
-                            $('#content').val("");
-                            $('#backContent').val("");
-                            $('#score').val("");
-                            $('input[name="returntoRole"]').each(function () {
-                                $(this).prop('checked', false);
-                            });
-                            $("#faultTypeDiv").empty();
-                            getFaultType();
+                            backSetValue();
                             $('#returnModal').modal({
                                 backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
                                 keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
@@ -345,6 +333,94 @@ function initTable() {
         });
     }
 }
+//退回需赋值
+function backSetValue(){
+    setFormToken();
+    $("#backChecked").empty();
+    $("#backInfoForm").empty();
+    $("#backInfoFlag").val(1);
+    $("#backChecked").append(backScanChecked);
+    $("#backInfoForm").append(backInfo);
+    $('#form2').find('input,textarea,checkbox').prop('readonly', false);
+    $('#returnBtn').show();
+    //清空标签的内容
+    $('#content').val("");
+    $('#backContent').val("");
+    $('#score').val("");
+    $('input[name="returntoRole"]').each(function () {
+        $(this).prop('checked', false);
+    });
+    $("#faultTypeDiv").empty();
+    getFaultType();
+}
+//退回扫描选中
+function onClickHander(obj){
+    $("#backChecked").empty();
+    $("#backInfoForm").empty();
+    if(obj.checked){
+        $("#backInfoFlag").val(2);
+        setFormToken();
+        $("#backChecked").append(backRoleChecked);
+        $("#backInfoForm").append(backScanInfo);
+    }
+}
+//审核退回
+function onClickHander1(obj){
+    if(obj.checked){
+        backSetValue();
+    }
+}
+//退回扫描复选框
+var backScanChecked = '<div id="backScan"><label for="back1" class="checkedDiv"><input type="checkbox" id="back1" onchange="onClickHander(this)">切换退回重新扫描</label></div>';
+//流程退回复选框
+var backRoleChecked = '<div id="backRole"><label for="back2" class="checkedDiv"><input type="checkbox" id="back2" onchange="onClickHander1(this)">切换流程退回</label></div>';
+//退回扫描表单
+var backScanInfo = '<form class="form-horizontal" id="form2">\n' +
+    '                                <div class="row divCss2">\n' +
+    '                                    <span style="vertical-align:top;">内容：</span><textarea id="backContent" rows="6"\n' +
+    '                                                                                          cols="80"\n' +
+    '                                                                                          maxlength="500"></textarea>\n' +
+    '                                </div>\n' +
+    '                            </form>';
+//流程退回表单
+var backInfo = '<!--通过审批且未过期的patientId集合-->\n' +
+    '                <form class="form-horizontal" id="form2">\n' +
+    '                    <div class="row">\n' +
+    '                        <div class="row divCss3">缺陷信息</div>\n' +
+    '                        <div class="row divCss2">\n' +
+    '                            <div class="row divCss2">\n' +
+    '                                <span style="float:left;vertical-align:top;">选项：</span>\n' +
+    '                                <div style="float:left;" id="faultTypeDiv">\n' +
+    '                                </div>\n' +
+    '                            </div>\n' +
+    '                            <div class="row divCss2">\n' +
+    '                                <span style="vertical-align:top;">内容：</span><textarea id="content" rows="6" cols="80"\n' +
+    '                                                                                      maxlength="500"></textarea>\n' +
+    '                            </div>\n' +
+    '                        </div>\n' +
+    '                    </div>\n' +
+    '                    <div class="divCss4"></div>\n' +
+    '                    <div class="row">\n' +
+    '                        <div class="row divCss3 ">退回信息</div>\n' +
+    '                        <div class="row divCss2">\n' +
+    '                            <div class="row divCss2">\n' +
+    '                                <span style="vertical-align:center;">评分：</span><input id="score" type="number"\n' +
+    '                                                                                      class="input-sm " min="1"/> 分\n' +
+    '                            </div>\n' +
+    '                            <div class="row divCss22">\n' +
+    '                                <span>退给角色：</span>\n' +
+    '                                <label><input type="checkbox" name="returntoRole" class="returntoRole" value="DOCTOR"/>医生</label>\n' +
+    '                                <label><input type="checkbox" name="returntoRole" class="returntoRole" value="NURSE"/>护士</label>\n' +
+    '                            </div>\n' +
+    '                            <div class="row divCss2">\n' +
+    '                                <span style="vertical-align:top;">内容：</span><textarea id="backContent" rows="6"\n' +
+    '                                                                                      cols="80"\n' +
+    '                                                                                      maxlength="500"></textarea>\n' +
+    '                            </div>\n' +
+    '                        </div>\n' +
+    '                    </div>\n' +
+    '                </form>';
+
 //确认批量审批列表
 function initTable3() {
     $("#table3").bootstrapTable("destroy");
@@ -363,31 +439,31 @@ function initTable3() {
                 title: '住院号',
                 field: 'inpNo',
                 align: 'left',
-                valign: 'middle',
+                valign: 'middle'
             },
             {
                 title: '住院次数',
                 field: 'visitId',
                 align: 'center',
-                valign: 'middle',
+                valign: 'middle'
             },
             {
                 title: '姓名',
                 field: 'name',
                 align: 'left',
-                valign: 'middle',
+                valign: 'middle'
             },
             {
                 title: '性别',
                 field: 'sex',
                 align: 'center',
-                valign: 'middle',
+                valign: 'middle'
             },
             {
                 title: '出院科室',
                 field: 'deptName',
                 align: 'left',
-                valign: 'middle',
+                valign: 'middle'
             },
             {
                 title: '出院日期',
@@ -400,7 +476,7 @@ function initTable3() {
             {
                 title: '主管医生',
                 field: 'doctorInCharge',
-                align: 'left',
+                align: 'left'
             },
         ],
         onLoadSuccess: function (result) {  //加载成功时执行
@@ -430,7 +506,6 @@ $("#verifyBtn").on('click', function () {
         var ids = $("#archiveId").val();
         //只有一个直接提交
         //获取柜子列个数
-        debugger
         var paperPostionValueLength = $("#paperPostionValueLength").val();
         if(paperPostionValueLength >= 1){
             for(var i = 1;i<=paperPostionValueLength;i++) {