修改湖南中西医结合医院 1.联系电话定死了11位数，有些老人家是座机

2.入院日期比如选22号但是会显示21号

ruisi_java/ruisi-system/src/main/java/com/ccsens/system/domain/dto/SysLoginDto.java

@@ -63,7 +63,6 @@ public class SysLoginDto {
     public static class GetSmsCode {
         @ApiModelProperty("手机号")
         @NotBlank(message = "手机号不能为空")
-        @Pattern(regexp = "(?:0|86|\\+86)?1[3-9]\\d{9}", message = "手机号格式不正确")
         private String phone;
     }
 

ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/controller/PmsController.java

@@ -3,7 +3,6 @@ package com.ccsens.admin.controller;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.IdcardUtil;
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.PhoneUtil;
 import cn.hutool.core.util.StrUtil;
 import com.ccsens.admin.service.IPmsPatientService;
 import com.ccsens.common.constant.ErrorConstant;
@@ -118,10 +117,6 @@ public class PmsController extends BaseController {
                 log.info("手机号为空");
                 throw new BaseException(ErrorConstant.MOBILE_NULL_ERROR);
             }
-            if( !PhoneUtil.isMobile(patientDto.getMobile()) && !PhoneUtil.isTel(patientDto.getMobile())){
-                //若手机号存在则验证手机号的格式是否正确
-                throw new BaseException(ErrorConstant.MOBILE_ERROR);
-            }
             //校验身份证格式
             if (StrUtil.isEmpty(patientDto.getIdcard())) {
                 throw new BaseException(ErrorConstant.ID_CARD_NULL);
@@ -141,10 +136,6 @@ public class PmsController extends BaseController {
         }else{
             //修改时手机号和身份证号不为空，则校验
             if(StrUtil.isNotEmpty(patientDto.getMobile())) {
-                if( !PhoneUtil.isMobile(patientDto.getMobile()) && !PhoneUtil.isTel(patientDto.getMobile())){
-                    //若手机号存在则验证手机号的格式是否正确
-                    throw new BaseException(ErrorConstant.MOBILE_ERROR);
-                }
                 //使用md5加密手机号
                 patientDto.setMobile(Md5Utils.hash(patientDto.getMobile()));
             }

ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/controller/PmsController.java

@@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.IdcardUtil;
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.PhoneUtil;
 import cn.hutool.core.util.StrUtil;
 import com.ccsens.client.service.IHmsService;
 import com.ccsens.client.service.ILtHisConnectionService;
@@ -145,10 +144,6 @@ public class PmsController extends BaseController {
                 log.info("手机号为空");
                 throw new BaseException(ErrorConstant.MOBILE_NULL_ERROR);
             }
-            if (!PhoneUtil.isMobile(patientDto.getMobile()) && !PhoneUtil.isTel(patientDto.getMobile())) {
-                //若手机号存在则验证手机号的格式是否正确
-                throw new BaseException(ErrorConstant.MOBILE_ERROR);
-            }
             //校验身份证格式
             if (StrUtil.isEmpty(patientDto.getIdcard())) {
                 throw new BaseException(ErrorConstant.ID_CARD_NULL);
@@ -171,10 +166,6 @@ public class PmsController extends BaseController {
         } else {
             //修改时手机号和身份证号不为空，则校验
             if (StrUtil.isNotEmpty(patientDto.getMobile())) {
-                if (!PhoneUtil.isMobile(patientDto.getMobile()) && !PhoneUtil.isTel(patientDto.getMobile())) {
-                    //若手机号存在则验证手机号的格式是否正确
-                    throw new BaseException(ErrorConstant.MOBILE_ERROR);
-                }
                 //使用md5加密手机号
                 if (flag) {
 //                    patientDto.setMobile(Md5Utils.hash(patientDto.getMobile()));
@@ -229,10 +220,6 @@ public class PmsController extends BaseController {
 //                log.info("手机号为空");
 //                throw new BaseException(ErrorConstant.MOBILE_NULL_ERROR);
 //            }
-            if (StrUtil.isNotEmpty(patientDto.getMobile()) && !PhoneUtil.isMobile(patientDto.getMobile()) && !PhoneUtil.isTel(patientDto.getMobile())) {
-                //若手机号存在则验证手机号的格式是否正确
-                throw new BaseException(ErrorConstant.MOBILE_ERROR);
-            }
             //校验身份证格式
             if (StrUtil.isEmpty(patientDto.getIdcard())) {
                 throw new BaseException(ErrorConstant.ID_CARD_NULL);
@@ -260,10 +247,6 @@ public class PmsController extends BaseController {
         } else {
             //修改时手机号和身份证号不为空，则校验
             if (StrUtil.isNotEmpty(patientDto.getMobile())) {
-                if (!PhoneUtil.isMobile(patientDto.getMobile()) && !PhoneUtil.isTel(patientDto.getMobile())) {
-                    //若手机号存在则验证手机号的格式是否正确
-                    throw new BaseException(ErrorConstant.MOBILE_ERROR);
-                }
                 if (flag) {
                     //使用md5加密手机号
 //                    patientDto.setMobile(Md5Utils.hash(patientDto.getMobile()));

ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/service/impl/IEmsServiceImpl.java

@@ -476,14 +476,9 @@ public class IEmsServiceImpl implements IEmsService {
         //签字的人对应的手机号不能为空
         if (ObjectUtil.isNotEmpty(dto.getSubjectSign()) && ObjectUtil.isEmpty(dto.getSubjectContact())) {
             throw new BaseException(ErrorConstant.PATIENT_INFORMED_CONSENT_CONTACT_NULL);
-        } else if (ObjectUtil.isNotEmpty(dto.getSubjectContact()) && !PhoneUtil.isMobile(dto.getSubjectContact()) && !PhoneUtil.isTel(dto.getSubjectContact())) {
-            //若手机号存在则验证手机号的格式是否正确
-            throw new BaseException(ErrorConstant.MOBILE_ERROR);
         }
         if (ObjectUtil.isNotEmpty(dto.getLegalAgentSign()) && ObjectUtil.isEmpty(dto.getLegalContact())) {
             throw new BaseException(ErrorConstant.PATIENT_INFORMED_CONSENT_CONTACT_NULL);
-        } else if (ObjectUtil.isNotEmpty(dto.getLegalContact()) && !PhoneUtil.isMobile(dto.getLegalContact()) && !PhoneUtil.isTel(dto.getLegalContact())) {
-            throw new BaseException(ErrorConstant.MOBILE_ERROR);
         }
     }
 
@@ -655,4 +650,5 @@ public class IEmsServiceImpl implements IEmsService {
         }
         return null;
     }
+
 }

web_admin/src/utils/generator/drawingDefault.js

@@ -15,15 +15,11 @@ export default [
     append: '',
     'prefix-icon': 'el-icon-mobile',
     'suffix-icon': '',
-    maxlength: 11,
+    maxlength: 20,
     'show-word-limit': true,
     readonly: false,
     disabled: false,
     required: true,
-    changeTag: true,
-    regList: [{
-      pattern: '/^1(3|4|5|7|8|9)\\d{9}$/',
-      message: '手机号格式错误'
-    }]
+    changeTag: true
   }
 ]

web_admin/src/views/system/dept/index.vue

@@ -187,7 +187,7 @@
               <el-input
                 v-model="form.phone"
                 placeholder="请输入联系电话"
-                maxlength="11"
+                maxlength="20"
               />
             </el-form-item>
           </el-col>
@@ -285,8 +285,8 @@ export default {
         ],
         phone: [
           {
-            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: "请输入正确的手机号码",
+            required: true,
+            message: "请输入联系电话",
             trigger: "blur",
           },
         ],

web_admin/src/views/system/user/index.vue

@@ -331,7 +331,6 @@
               <el-input
                 v-model="form.phonenumber"
                 placeholder="请输入手机号码"
-                maxlength="11"
                 style="width: 220px"
               />
             </el-form-item>
@@ -668,13 +667,7 @@ export default {
             trigger: ["blur", "change"],
           },
         ],
-        phonenumber: [
-          {
-            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: "请输入正确的手机号码",
-            trigger: "blur",
-          },
-        ],
+        phonenumber: [],
       },
     };
   },

web_admin/src/views/system/user/profile/userInfo.vue

@@ -4,7 +4,7 @@
       <el-input v-model="form.nickName" maxlength="30" />
     </el-form-item> 
     <el-form-item label="手机号码" prop="phonenumber">
-      <el-input v-model="form.phonenumber" maxlength="11" />
+      <el-input v-model="form.phonenumber" maxlength="20" />
     </el-form-item>
     <el-form-item label="邮箱" prop="email">
       <el-input v-model="form.email" maxlength="50" />
@@ -49,11 +49,6 @@ export default {
         ],
         phonenumber: [
           { required: true, message: "手机号码不能为空", trigger: "blur" },
-          {
-            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: "请输入正确的手机号码",
-            trigger: "blur"
-          }
         ]
       }
     };

web_admin/vue.config.js

@@ -40,7 +40,8 @@ module.exports = {
         // target: "http://192.168.1.136:19330",
         // target: "https://nnzjpt.ylinno.com/ruisiCgaAdmin/",
         // target: "https://www.ylinno.com/cga/v2/api/admin/",
-        target: "http://113.45.159.249:59001/cga/v2/api/admin/",
+        target: "http://localhost:19330",
+        // target: "http://113.45.159.249:59001/cga/v2/api/admin/",
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",

web_client/src/components/note.vue

@@ -109,11 +109,6 @@ export default {
         this.$message.error("手机号不能为空");
         return;
       }
-      let regs = /^1[3-9]\d{9}$/;
-      if (!regs.test(this.phone)) {
-        this.$message.error("手机号输入不合法");
-        return;
-      }
 
       const res = await getSmsCode(this.phone);
       const { code, data, msg } = res;
@@ -175,11 +170,6 @@ export default {
         this.$message.error("手机号不能为空");
         return;
       }
-      let regs = /^1[3-9]\d{9}$/;
-      if (!regs.test(this.phone)) {
-        this.$message.error("手机号输入不合法");
-        return;
-      }
       if (!this.smsCode) {
         this.show = true;
         this.$message.error("验证码不能为空");

web_client/src/components/retrieve.vue

@@ -144,11 +144,6 @@ export default {
         this.$message.error("手机号不能为空");
         return;
       }
-      let regs = /^1[3-9]\d{9}$/;
-      if (!regs.test(this.phone)) {
-        this.$message.error("手机号输入不合法");
-        return;
-      }
 
       const res = await getSmsCode(this.phone);
       const { code, data, msg } = res;
@@ -229,11 +224,6 @@ export default {
         this.$message.error("手机号不能为空");
         return;
       }
-      let regs = /^1[3-9]\d{9}$/;
-      if (!regs.test(this.phone)) {
-        this.$message.error("手机号输入不合法");
-        return;
-      }
       if (!this.smsCode) {
         this.$message.error("验证码不能为空");
         return;

web_client/src/views/Patient/Assist.vue

@@ -51,7 +51,7 @@
           </div>
           <div class="div-li" style="text-align: left">
             <span>诊断日期</span>
-            <el-date-picker v-model="patient.diagnosisDate" type="date">
+            <el-date-picker v-model="patient.diagnosisDate" type="date" value-format="yyyy-MM-dd">
             </el-date-picker>
           </div>
           <div class="div-li"></div>

web_client/src/views/Patient/familyHistory.vue

@@ -78,6 +78,7 @@
             <el-date-picker
               v-model="people.diagnosisDate"
               type="date"
+              value-format="yyyy-MM-dd"
               :disabled="people.patientId ? true : false"
             >
             </el-date-picker>

web_client/src/views/Patient/pastBodyInfo.vue

@@ -71,6 +71,7 @@
               <el-date-picker
                 v-model="people.admissionDate"
                 type="date"
+                value-format="yyyy-MM-dd"
                 placeholder="仅住院填写"
               >
               </el-date-picker>
@@ -132,6 +133,7 @@
               <el-date-picker
                 v-model="people.dischargeDate"
                 type="date"
+                value-format="yyyy-MM-dd"
                 placeholder="仅住院填写"
               >
               </el-date-picker>
@@ -353,6 +355,7 @@
               <el-date-picker
                 v-model="people.diagnosisDate"
                 type="date"
+                value-format="yyyy-MM-dd"
                 :disabled="people.patientId ? true : false"
               >
               </el-date-picker>

web_client/src/views/evaluation/index.vue

@@ -61,6 +61,7 @@
                 <el-date-picker
                   v-model="people.admissionDate"
                   type="date"
+                  value-format="yyyy-MM-dd"
                   placeholder="仅住院填写"
                 >
                 </el-date-picker>
@@ -110,6 +111,7 @@
                 <el-date-picker
                   v-model="people.dischargeDate"
                   type="date"
+                  value-format="yyyy-MM-dd"
                   placeholder="仅住院填写"
                 >
                 </el-date-picker>

web_client/vue.config.js

@@ -36,7 +36,8 @@ module.exports = {
     proxy: {
       [settings.proxyUrl]: {
         // target: "https://www.ylinno.com/cga/v2/api/client/",
-        target: "http://113.45.159.249:59001/cga/v2/api/client/",
+        target: "http://localhost:19331",
+        // target: "http://113.45.159.249:59001/cga/v2/api/client/",
         // target: "http://127.0.0.1:19331",
         // target: "http://192.168.1.116:19331",
         changeOrigin: true,

web_examine/src/components/collapse.vue

@@ -243,14 +243,6 @@ export default {
 			}
 		},
 		blurPrice(_name) {
-			if (_name == 'mobile' && this.isMobileChange) {
-				let regs = /^1[3-9]\d{9}$/;
-				if (!regs.test(this.dataInfo.mobile)) {
-					this.dataInfo.mobile = '';
-					this.$message.error('联系方式输入不合法，请重新填写');
-					return;
-				}
-			}
 			if (_name == 'idcard' && this.isCarChange) {
 				let regs = /^([1-9]\d{5})(\d{4})(\d{2})(\d{2})(\d{3})(\d|X)$/;
 				if (!regs.test(this.dataInfo.idcard)) {

web_examine/src/components/note.vue

@@ -113,11 +113,6 @@ export default {
 				this.$message.error('手机号不能为空');
 				return;
 			}
-			let regs = /^1[3-9]\d{9}$/;
-			if (!regs.test(this.phone)) {
-				this.$message.error('手机号输入不合法');
-				return;
-			}
 
 			const res = await getSmsCode(this.phone);
 			const { code, data, msg } = res;
@@ -179,11 +174,6 @@ export default {
 				this.$message.error('手机号不能为空');
 				return;
 			}
-			let regs = /^1[3-9]\d{9}$/;
-			if (!regs.test(this.phone)) {
-				this.$message.error('手机号输入不合法');
-				return;
-			}
 			if (!this.smsCode) {
 				this.show = true;
 				this.$message.error('验证码不能为空');

web_examine/src/components/retrieve.vue

@@ -148,11 +148,6 @@ export default {
 				this.$message.error('手机号不能为空');
 				return;
 			}
-			let regs = /^1[3-9]\d{9}$/;
-			if (!regs.test(this.phone)) {
-				this.$message.error('手机号输入不合法');
-				return;
-			}
 
 			const res = await getSmsCode(this.phone);
 			const { code, data, msg } = res;
@@ -233,11 +228,6 @@ export default {
 				this.$message.error('手机号不能为空');
 				return;
 			}
-			let regs = /^1[3-9]\d{9}$/;
-			if (!regs.test(this.phone)) {
-				this.$message.error('手机号输入不合法');
-				return;
-			}
 			if (!this.smsCode) {
 				this.$message.error('验证码不能为空');
 				return;

web_examine/vue.config.js

@@ -36,8 +36,9 @@ module.exports = {
     },
     proxy: {
       [settings.proxyUrl]: {
+        target: "http://localhost:19332",
         // target: "http://113.45.159.249:59001/cga/v2/api/examine/",
-        target: "https://www.ylinno.com/cga/v2/api/examine/",
+        // target: "https://www.ylinno.com/cga/v2/api/examine/",
         changeOrigin: true,
         pathRewrite: {
           ["^" + settings.proxyUrl]: "",