优化

src/main/java/cn/hnthyy/thmz/service/his/mz/MzOrderDetailService.java

@@ -25,4 +25,6 @@ public interface MzOrderDetailService {
     String queryOrderTypeName(String patientId, Integer times);
 
     MzOrderDetail queryByPatientIdAndTimes(String patientId, Integer times);
+
+    int removeByPatientIdAndTimes(String patientId, Integer times);
 }

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

@@ -52,6 +52,8 @@ import cn.hutool.core.convert.Convert;
 import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.Transformer;
@@ -1497,6 +1499,8 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
             throw new MzException("处方已经结算,不能删除处方,如要删除请找医保科取消医保结算再删除");
         }
         int num = clinicMapper.deleteById(clnicId);
+        mzOrderDetailService.removeByPatientIdAndTimes(clinic.getPatientId(), clinic.getTimes());
+        mzOrderLockMapper.deleteById(Tools.getHisOrdNum(clinic.getPatientId(), clinic.getTimes(), 1));
         mzVisitTableMapper.deleteByPatientIdAndTimes(clinic.getPatientId(), clinic.getTimes());
         mzBaRecordMapper.deleteByPatientIdAndTimes(clinic.getPatientId(), clinic.getTimes());
         mzBlRecordMapper.deleteNotPayBlRecordByPatientId(clinic.getPatientId(), clinic.getTimes());

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

@@ -37,7 +37,7 @@ public class MzOrderDetailServiceImpl implements MzOrderDetailService {
             UpdateWrapper<MzOrderDetail> updateWrapper = new UpdateWrapper();
             updateWrapper.eq("patient_id", mzOrderDetail.getPatientId());
             updateWrapper.eq("times", mzOrderDetail.getTimes());
-            dao.update(mzOrderDetail, updateWrapper);
+          return dao.update(mzOrderDetail, updateWrapper);
         }
         return dao.insert(mzOrderDetail);
     }
@@ -75,4 +75,13 @@ public class MzOrderDetailServiceImpl implements MzOrderDetailService {
         }
         return null;
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int removeByPatientIdAndTimes(String patientId, Integer times) {
+        QueryWrapper<MzOrderDetail> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("patient_id", patientId);
+        queryWrapper.eq("times", times);
+        return dao.delete(queryWrapper);
+    }
 }

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

@@ -2227,11 +2227,14 @@ function initAdvmPro(proId) {
             }
             $('#'+proId).html(selectHtml);
             $('#'+proId).selectpicker('refresh');
+            $('#'+proId).val(430000);
+            $('#'+proId).selectpicker('refresh');
+            cityChange('visitAdvmPro','visitAdvmCity',430100)
         }
     })
 }
 
-function cityChange(proId,cityId) {
+function cityChange(proId,cityId,defalultVal) {
     let code = $('#'+proId).val()
     postAjaxJsonHttpRequst("/thmz/queryCityCodes",{code:code},true,function (res) {
         if(res.code == 0 && res.data !=null && res.data.length > 0){
@@ -2241,6 +2244,10 @@ function cityChange(proId,cityId) {
             }
             $('#'+cityId).html(selectHtml);
             $('#'+cityId).selectpicker('refresh');
+            if(!stringIsBlank(defalultVal)){
+                $('#'+cityId).val(defalultVal);
+                $('#'+cityId).selectpicker('refresh');
+            }
         }
     })
 }

src/main/resources/templates/mz/clinic.html

@@ -3391,7 +3391,7 @@
                     </label>
                     <label class="col-md-3 col-sm-3 col-xs-12" for="visitAdvmPro">
                         <select class="form-control selectpicker show-tick"  data-live-search="true"
-                                id="visitAdvmPro" onchange="cityChange('visitAdvmPro','visitAdvmCity')" title="参保地省"></select>
+                                id="visitAdvmPro" onchange="cityChange('visitAdvmPro','visitAdvmCity',null)" title="参保地省"></select>
                     </label>
                     <label class="col-md-3 col-sm-3 col-xs-12" for="visitAdvmCity">
                         <select class="form-control selectpicker show-tick"  data-live-search="true"