优化门诊医生页面

src/main/java/cn/hnthyy/thmz/controller/mz/MzZdYpYshController.java

@@ -45,12 +45,12 @@ public class MzZdYpYshController {
                 resultMap.put("message", "药房编码不能为空");
                 return resultMap;
             }
-            if (StringUtils.isBlank(commonParams)) {
-                resultMap.put("code", 0);
-                resultMap.put("message", "查询参数为空，未查询到符合条件的药品");
-                resultMap.put("data", Arrays.asList());
-                return resultMap;
-            }
+//            if (StringUtils.isBlank(commonParams)) {
+//                resultMap.put("code", 0);
+//                resultMap.put("message", "查询参数为空，未查询到符合条件的药品");
+//                resultMap.put("data", Arrays.asList());
+//                return resultMap;
+//            }
             List<MzZdYpYsh> mzZdYpYshes = mzZdYpYshService.queryMzZdYpYshByCommonParamsAndGroupNo(commonParams, groupNo);
             if (mzZdYpYshes == null || mzZdYpYshes.size() == 0) {
                 resultMap.put("code", -1);
@@ -82,12 +82,12 @@ public class MzZdYpYshController {
     public Map<String, Object> getJcJyItemByCommonParams(@RequestParam("commonParams") String commonParams) {
         Map<String, Object> resultMap = new HashMap<>();
         try {
-            if (StringUtils.isBlank(commonParams)) {
-                resultMap.put("code", 0);
-                resultMap.put("message", "查询参数为空，未查询到符合条件的诊疗与医技");
-                resultMap.put("data", Arrays.asList());
-                return resultMap;
-            }
+//            if (StringUtils.isBlank(commonParams)) {
+//                resultMap.put("code", 0);
+//                resultMap.put("message", "查询参数为空，未查询到符合条件的诊疗与医技");
+//                resultMap.put("data", Arrays.asList());
+//                return resultMap;
+//            }
             //检查与检验
             List<JyZdItem> jyZdItemList = jcJyItemChargeService.queryJcJyItemByCommonParams(commonParams);
 //            //诊疗

src/main/java/cn/hnthyy/thmz/service/impl/his/zd/JcJyItemChargeServiceImpl.java

@@ -74,10 +74,10 @@ public class JcJyItemChargeServiceImpl implements JcJyItemChargeService {
     @Override
     public List<JyZdItem> queryJcJyItemByCommonParams(String commonParams) {
         //Integer pageSize =2000;
-        Integer pageSize =5;
+        Integer pageSize =30;
         if (StringUtils.isBlank(commonParams)) {
             commonParams = null;
-            pageSize =1;
+            pageSize =5;
         }
 //        if (SignUtil.isAlpha(commonParams)) {
 //            commonParams = commonParams.toUpperCase();

src/main/java/cn/hnthyy/thmz/service/impl/his/zd/MzZdYpYshServiceImpl.java

@@ -22,12 +22,13 @@ public class MzZdYpYshServiceImpl implements MzZdYpYshService {
 
     @Override
     public List<MzZdYpYsh> queryMzZdYpYshByCommonParamsAndGroupNo(String commonParams, String groupNo) {
+        Integer pageSize =30;
         if (StringUtils.isBlank(commonParams)) {
             commonParams = null;
+            pageSize =5;
         } else {
             commonParams = "%"+commonParams + "%";
         }
-        Integer pageSize =5;
         List<MzZdYpYsh> mzZdYpYshes = mzZdYpYshMapper.selectMzZdYpYshByCommonParamsAndGroupNo(commonParams, groupNo,pageSize);
         //如果查询的是西成药，需要把医材 和诊疗项目，麻、精一，精二也查询过来
         if (Constants.XY_ZCY_GROUP_NO.equals(groupNo)) {

src/main/java/cn/hnthyy/thmz/service/impl/thmz/ClinicServiceImpl.java

@@ -70,7 +70,8 @@ public class ClinicServiceImpl implements ClinicService {
 
     @Override
     public Integer queryNumberOfPrescription(Clinic clinic) {
-        return clinicMapper.selectNumberOfPrescription(clinic);
+        Integer num= clinicMapper.selectNumberOfPrescription(clinic);
+        return num==null?0:num;
     }
 
     @Override

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

@@ -921,7 +921,7 @@
 <!--快速接诊弹窗开始-->
 <div class="modal fade bs-example-modal-lg" tabindex="-1" role="dialog" aria-hidden="true" id="rapidAcceptsModal">
     <div class="modal-dialog modal-lg">
-        <div class="modal-content" style="width: 680px;">
+        <div class="modal-content" style="width: 680px;max-height: 600px;overflow-y: auto;">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" onclick="clearRapidAccepts()"><span
                         aria-hidden="true">×</span>
@@ -1015,7 +1015,7 @@
 <!--修改用户信息弹窗开始-->
 <div class="modal fade bs-example-modal-lg" tabindex="-1" role="dialog" aria-hidden="true" id="editUserModal">
     <div class="modal-dialog modal-lg">
-        <div class="modal-content" style="width: 680px;">
+        <div class="modal-content" style="width: 680px;max-height: 600px;overflow-y: auto;">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span>
                 </button>
@@ -1443,7 +1443,7 @@
 <div class="modal fade bs-example-modal-sm in" tabindex="-1" role="dialog" aria-hidden="true" id="messageModal"
      style="top:20%;">
     <div class="modal-dialog modal-sm">
-        <div class="modal-content" style="width: 480px;">
+        <div class="modal-content" style="width: 480px;max-height: 600px;overflow-y: auto;">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span>
                 </button>
@@ -1474,7 +1474,7 @@
 <div class="modal fade bs-example-modal-sm in" tabindex="-1" role="dialog" aria-hidden="true" id="configWorkspaceModal"
      style="top:20%;">
     <div class="modal-dialog modal-sm">
-        <div class="modal-content" style="width: 550px;">
+        <div class="modal-content" style="width: 550px;max-height: 600px;overflow-y: auto;">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span>
                 </button>
@@ -1527,7 +1527,7 @@
 <div class="modal fade bs-example-modal-sm in" tabindex="-1" role="dialog" aria-hidden="true" id="jcJyItemModal"
      style="top:20%;">
     <div class="modal-dialog modal-sm">
-        <div class="modal-content" style="width: 780px;">
+        <div class="modal-content" style="width: 780px;max-height: 600px;overflow-y: auto;">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span>
                 </button>
@@ -1554,7 +1554,7 @@
 <div class="modal fade bs-example-modal-sm in" tabindex="-1" role="dialog" aria-hidden="true" id="saveapidAcceptsModal"
      style="top:20%;">
     <div class="modal-dialog modal-sm">
-        <div class="modal-content" style="width: 550px;">
+        <div class="modal-content" style="width: 550px;max-height: 600px;overflow-y: auto;">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span>
                 </button>
@@ -1623,7 +1623,7 @@
      id="messagePrescriptionModal"
      style="top:20%;">
     <div class="modal-dialog modal-sm">
-        <div class="modal-content" style="width: 480px;">
+        <div class="modal-content" style="width: 480px;max-height: 600px;overflow-y: auto;">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span>
                 </button>
@@ -2192,7 +2192,7 @@
 <!--分诊列表弹窗开始-->
 <div class="modal fade bs-example-modal-lg" tabindex="-1" role="dialog" aria-hidden="true" id="mzfzPatientOrderModal">
     <div class="modal-dialog modal-lg">
-        <div class="modal-content" style="width: 700px;">
+        <div class="modal-content" style="width: 700px;max-height: 600px;overflow-y: auto;">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span>
                 </button>
@@ -2229,7 +2229,7 @@
 <!--特门详情列表弹窗开始-->
 <div class="modal fade bs-example-modal-lg" tabindex="-1" role="dialog" aria-hidden="true" id="fetchSpcSlwinfoModal">
     <div class="modal-dialog modal-lg">
-        <div class="modal-content" style="width: 800px;">
+        <div class="modal-content" style="width: 800px;max-height: 600px;overflow-y: auto;">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span>
                 </button>
@@ -2477,7 +2477,7 @@
 <!--病历编辑弹窗开始-->
 <div class="modal fade bs-example-modal-lg" tabindex="-1" role="dialog" aria-hidden="true" id="editMzBlRecordModal">
     <div class="modal-dialog modal-lg">
-        <div class="modal-content" style="width: 680px;">
+        <div class="modal-content" style="width: 680px;max-height: 600px;overflow-y: auto;">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" onclick="clearInput()"><span aria-hidden="true">×</span>
                 </button>
@@ -2629,7 +2629,7 @@
 <!--待合并病历列表弹框开始-->
 <div class="modal fade bs-example-modal-lg" tabindex="-1" role="dialog" aria-hidden="true" id="otherBlRecordModal">
     <div class="modal-dialog modal-lg">
-        <div class="modal-content" style="width: 980px;">
+        <div class="modal-content" style="width: 980px;max-height: 600px;overflow-y: auto;">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" onclick="closeBlRecordModel()"><span aria-hidden="true">×</span>
                 </button>

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

@@ -190,7 +190,7 @@
 <!--病历编辑弹窗开始-->
 <div class="modal fade bs-example-modal-lg" tabindex="-1" role="dialog" aria-hidden="true" id="editMzBlRecordModal">
     <div class="modal-dialog modal-lg">
-        <div class="modal-content" style="width: 680px;">
+        <div class="modal-content" style="width: 680px;max-height: 600px;overflow-y: auto;">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" onclick="clearInput()"><span aria-hidden="true">×</span>
                 </button>
@@ -342,7 +342,7 @@
 <div class="modal fade bs-example-modal-sm in" tabindex="-1" role="dialog" aria-hidden="true" id="messageModal"
      style="top:20%;">
     <div class="modal-dialog modal-sm">
-        <div class="modal-content" style="width: 480px;">
+        <div class="modal-content" style="width: 480px;max-height: 600px;overflow-y: auto;">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span>
                 </button>
@@ -372,7 +372,7 @@
 <!--待合并病历列表弹框开始-->
 <div class="modal fade bs-example-modal-lg" tabindex="-1" role="dialog" aria-hidden="true" id="otherBlRecordModal">
     <div class="modal-dialog modal-lg">
-        <div class="modal-content" style="width: 980px;">
+        <div class="modal-content" style="width: 980px;max-height: 600px;overflow-y: auto;">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span>
                 </button>