'解决gitbug'

src/main/java/cn/hnthyy/thmz/service/impl/his/mz/MzDrugTracCodgServiceImpl.java

@@ -174,10 +174,10 @@ public class MzDrugTracCodgServiceImpl implements MzDrugTracCodgService {
             codg.setGroupNo(vo.getGroupNo());
             // 添加realNo条件，使用绝对值
             codg.setRealNo(Math.abs(vo.getRealNo()));
-
+            
             // 首先尝试使用完整条件查询
             List<MzDrugTracCodg> l = mzDrugTracCodgMapper.selectMzDrugTracCodgData(codg);
-
+            
             // 如果没找到，尝试简化条件查询（只使用基本条件）
             if(l.isEmpty()) {
                 MzDrugTracCodg simpleCodg = new MzDrugTracCodg();
@@ -187,7 +187,7 @@ public class MzDrugTracCodgServiceImpl implements MzDrugTracCodgService {
                 simpleCodg.setItemNo(vo.getItemNo());
                 l = mzDrugTracCodgMapper.selectMzDrugTracCodgData(simpleCodg);
             }
-
+            
             list.addAll(l);
         }
         if(!list.isEmpty()){

src/main/java/cn/hnthyy/thmz/vo/MzRefundMedicineVo.java

@@ -13,8 +13,6 @@ import java.util.Date;
  */
 @Data
 public class MzRefundMedicineVo implements Serializable {
-    //药品追溯码
-    private String drugTracCode;
     //病人ID码
     private String patientId;
     //次数

src/main/resources/static/js/common/socket-com.js

@@ -9,7 +9,6 @@ var currentList = getLocalStorage("currentList", []);
 var pastList = getLocalStorage("pastList", []);
 //血液中心出发打印
 var printType = '';
-let hasErrorMessage = false
 function openSocket(type) {
 //判断当前浏览器是否支持WebSocket
     try {
@@ -57,7 +56,7 @@ function openSocket(type) {
                         prescriptionPrintWebsocket.onclose = function (event) {
                             console.log(type + "连接prescriptionPrintSocket连接关闭 code:" + event.code + ",原因：" + event.reason + "，是否正常关闭：" + event.wasClean);
                             if (event.code == '1001' || event.code == '1006') {//1001：终端离开, 可能因为服务端错误 1006：没有发送关闭帧
-                                // openSocket(type);
+                                openSocket(type);
                                 console.log("自动关闭异常");
                             }
                         };
@@ -66,28 +65,14 @@ function openSocket(type) {
                             prescriptionPrintWebsocket.close();
                         }
                     } else if (res.code === -1) {
-                        if (hasErrorMessage) {
-                            return false
-                        }
-                        hasErrorMessage = true
                         errorMesageSimaple('自动打印连接socket失败，正尝试重连...');
-                        setTimeout(()=>{
-                            hasErrorMessage = false
-                        },4000)
-                        // openSocket(type);
+                        openSocket(type);
                         console.log("返回异常");
                     }
                 },
                 error: function () {
-                    if (hasErrorMessage) {
-                        return false
-                    }
-                    hasErrorMessage = true
                     errorMesageSimaple('自动打印连接socket失败，正尝试重连...');
-                    setTimeout(()=>{
-                        hasErrorMessage = false
-                    },4000)
-                    // openSocket(type);
+                    openSocket(type);
                     console.log("请求异常");
                 }
             });
@@ -95,7 +80,7 @@ function openSocket(type) {
             alert('当前浏览器不支持WebSocket，请更换浏览器');
         }
     } catch (e) {
-        // openSocket(type);
+        openSocket(type);
         console.log("捕捉异常");
         console.log(e);
     }

src/main/resources/static/js/mz/registration.js

@@ -1320,9 +1320,6 @@ function extracted(res) {
     $("#patientsNature").blur();
     $('#certificateType').selectpicker('val', res.data.certificateType);
     $('#certificateType').selectpicker('refresh');
-
-
-
     $("#idCard").val(res.data.socialNo);
     $("#idCard").attr("title", res.data.socialNo);
     $("#idCard").blur();