Ver código fonte

入院优化

lihong 1 ano atrás
pai
commit
83f2edd462

+ 1 - 1
src/main/java/cn/hnthyy/thmz/Utils/StringUtil.java

@@ -239,7 +239,7 @@ public class StringUtil {
         return m.matches();
     }
 
-    public static String getExceptionToString(Throwable e) {
+    public static String getExceptionToString(Exception e) {
         if (e == null) {
             return "" ;
         }

+ 20 - 20
src/main/java/cn/hnthyy/thmz/controller/zy/APatientMiController.java

@@ -202,11 +202,11 @@ public class APatientMiController {
             resultMap.put("message", "病人出生地址不能为空");
             return true;
         }
-        if(aPatientMi.getBirthPlace().length()>10){
-            resultMap.put("code", -1);
-            resultMap.put("message", "出生地址长度超长");
-            return true;
-        }
+        //if(aPatientMi.getBirthPlace().length()>10){
+        //    resultMap.put("code", -1);
+        //    resultMap.put("message", "出生地址长度超长");
+        //    return true;
+        //}
         if (StringUtils.isBlank(aPatientMi.getAccountStreet())) {
             resultMap.put("code", -1);
             resultMap.put("message", "病人户口地址不能为空");
@@ -220,27 +220,27 @@ public class APatientMiController {
         if (StringUtils.isBlank(aPatientMi.getHomeStreet())) {
             aPatientMi.setHomeStreet("-");
         }
-        if(aPatientMi.getHomeStreet().length()>16){
-            resultMap.put("code", -1);
-            resultMap.put("message", "家庭住址长度超长");
-            return true;
-        }
+        //if(aPatientMi.getHomeStreet().length()>16){
+        //    resultMap.put("code", -1);
+        //    resultMap.put("message", "家庭住址长度超长");
+        //    return true;
+        //}
         if (StringUtils.isBlank(aPatientMi.getAccountStreet())) {
             aPatientMi.setAccountStreet("-");
         }
-        if(aPatientMi.getAccountStreet().length()>10){
-            resultMap.put("code", -1);
-            resultMap.put("message", "户口地址长度超长");
-            return true;
-        }
+        //if(aPatientMi.getAccountStreet().length()>32{
+        //    resultMap.put("code", -1);
+        //    resultMap.put("message", "户口地址长度超长");
+        //    return true;
+        //}
         if (StringUtils.isBlank(aPatientMi.getEmployerStreet())) {
             aPatientMi.setEmployerStreet("-");
         }
-        if(aPatientMi.getEmployerStreet().length()>16){
-            resultMap.put("code", -1);
-            resultMap.put("message", "单位地址长度超长");
-            return true;
-        }
+        //if(aPatientMi.getEmployerStreet().length()>32){
+        //    resultMap.put("code", -1);
+        //    resultMap.put("message", "单位地址长度超长");
+        //    return true;
+        //}
         if(StringUtils.isNotBlank(aPatientMi.getSocialNo()) && !aPatientMi.getSocialNo().startsWith("K")){
             //校验身份证号码格式
             String checkResult = IDCardUtil.IdentityCardVerification(aPatientMi.getSocialNo());

+ 1 - 1
src/main/java/cn/hnthyy/thmz/interceptor/GlobalExceptionHandler.java

@@ -56,7 +56,7 @@ public class GlobalExceptionHandler {
     @ExceptionHandler(Exception.class)
     @ResponseBody
     public R handleException(Exception e){
-        log.error("系统报错", e);
+        log.error("系统报错:"+e.getMessage(), e);
         String exceptionToString = StringUtil.getExceptionToString(e);
         return R.error(StringUtils.substring(exceptionToString,0,1000 ));
     }

+ 3 - 2
src/main/resources/templates/mz/clinic.html

@@ -417,8 +417,9 @@
                     </div>
                     <div class="item form-group customization" id="emrPsFlag" target-id="emrPs">
                         <label class="my_label">既往史:</label>
-                        <input id="emrPs" class="form-control my_label_input"
-                               placeholder="请输入" type="text" data-placement="bottom-right">
+                        <textarea id="emrPs" class="form-control my_label_input" placeholder="请输入"></textarea>
+<!--                        <input id="emrPs" class="form-control my_label_input"-->
+<!--                               placeholder="请输入" type="text" data-placement="bottom-right">-->
                     </div>
                     <div class="item form-group customization" id="personalHistoryFlag" target-id="personalHistory">
                         <label class="my_label">个人史:</label>