Merge remote-tracking branch 'origin/test' into test

src/html/qcScore.html

@@ -2116,7 +2116,17 @@
                         {{if 性别 == '女'}}
                         <div class="cont">
                             <span class="label">妇科标本月经情况:</span>
-                            <span>${月经史&&月经史+'，'}${经期天数&&经期天数+'，'}${末次月经日期&&末次月经日期}</span>
+                            <span>
+                                {{if 月经史}}
+                                    ${月经史}，
+                                {{/if}}
+                                {{if 经期天数}}
+                                    ${经期天数}，
+                                {{/if}}
+                                {{if 末次月经日期}}
+                                    ${末次月经日期}
+                                {{/if}}
+                            </span>
                         </div>
                         {{/if}}
                         <div class="cont">

src/js/qcList.js

@@ -67,6 +67,16 @@ getTabData(1)
 $(".filter").on("click", function(e){
     behosDateStart = $("#datepicker").val().trim()
     behosDateEnd = $("#datepicker2").val().trim()
+    const start = new Date(behosDateStart).getTime()
+    const end = new Date(behosDateEnd).getTime()
+    if(start > end){
+        removeDialog()
+        dialog('开始时间不能大于结束时间~')
+        setTimeout(function(){
+            removeDialog()
+        },2000)
+        return
+    }
     if(behosDateStart){
         behosDateStart = behosDateStart.replace(/\//g,'-') + ' 00:00:00'
     }