Merge branch 'dev-1.0.6' into dev-1.0.5

src/main/java/cn/hnthyy/thmz/mapper/his/MzyRequestMapper.java

@@ -172,7 +172,7 @@ public interface MzyRequestMapper {
             "    FROM mzy_request_new " +
             " where " +
             "         request_day >= #{beginDate,jdbcType=TIMESTAMP} and " +
-            "         request_day <= #{endDate,jdbcType=TIMESTAMP} order by request_day ")
+            "         request_day <= #{endDate,jdbcType=TIMESTAMP} order by request_day,unit_code ")
     List<MzyRequest> selectByTimes(@Param("beginDate") Date beginDate, @Param("endDate") Date endDate);
 
 

src/main/java/cn/hnthyy/thmz/mapper/his/MzyZdChargeTypeMapper.java

@@ -11,7 +11,7 @@ public interface MzyZdChargeTypeMapper {
      * 查询所有的号别
      * @return
      */
-    @Select("SELECT rtrim(code) code,rtrim(name) name,rtrim(py_code) py_code,rtrim(d_code) self_code,req_fee,clinic_fee,oth_fee,del_flag,rtrim(req_type) req_type,sort_no,print_flag FROM mzy_zd_charge_type where del_flag  <> 1 ")
+    @Select("SELECT rtrim(code) code,rtrim(name) name,rtrim(py_code) py_code,rtrim(d_code) self_code,req_fee,clinic_fee,oth_fee,del_flag,rtrim(req_type) req_type,sort_no,print_flag FROM mzy_zd_charge_type where (del_flag  <> 1  or del_flag is null )")
     List<MzyZdChargeType> selectAllMzyZdChargeType();
 
     /**

src/main/java/cn/hnthyy/thmz/service/impl/his/MzyRequestServiceImpl.java

@@ -139,6 +139,9 @@ public class MzyRequestServiceImpl implements MzyRequestService {
         Date now = new Date();
         for (MzyRequest m:mzyRequests){
             if(m!=null){
+                if(m.getChargeType()==null){
+                    m.setChargeType("");
+                }
                 m.setOpId(opId);
                 m.setSysDate(now);
                 if(m.getId()!=null){

src/main/resources/static/js/request.js

@@ -1,6 +1,6 @@
 //@ sourceURL=request.js
 //默认是查询基础号表字典，当选择源数据的时候改为false
-var baseList = true;
+var baseList = false;
 //默认是显示一个表格，当点击生产新号表时，改为true
 var showTwoTable = false;
 //保存临时生成的新号表数据
@@ -786,7 +786,7 @@ function initChargeType() {
                 window.location.href = '/thmz/login/view'
                 return;
             }
-            var html = '';
+            var html = '<option value=""></option>';
             $.each(res.data, function (commentIndex, comment) {
                 html += '<option value="' + comment.code + '">' + comment.name + '</option>';
             });

src/main/resources/templates/request.html

@@ -33,9 +33,9 @@
                     </div>
                     <div class="form-group col-md-12 col-sm-12 col-xs-12">
                         <div class="btn-group col-md-3 col-sm-3 col-xs-12" id="source_group">
-                            <button class="btn btn-sm btn-primary" type="button" onclick="sourceChange(this)">&nbsp;&nbsp;基础号表&nbsp;&nbsp;
+                            <button class="btn btn-sm btn-default" type="button" onclick="sourceChange(this)">&nbsp;&nbsp;基础号表&nbsp;&nbsp;
                             </button>
-                            <button class="btn btn-sm btn-default" type="button" onclick="sourceChange(this)">&nbsp;&nbsp;源号表&nbsp;&nbsp;
+                            <button class="btn btn-sm btn-primary" type="button" onclick="sourceChange(this)">&nbsp;&nbsp;源号表&nbsp;&nbsp;
                             </button>
                         </div>
                         <div class="btn-group col-md-4 col-sm-4 col-xs-12"></div>