From 1a50269b1d072fe2da7e70ae48315ebeb4ef95f4 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Tue, 02 Mar 2021 18:32:55 +0800
Subject: [PATCH] 完善筛查和 input框记录数据得bug
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml | 2 +-
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java | 8 ++++----
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html | 2 +-
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/departmentProduct.html | 4 ++--
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor.html | 6 +++---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ScreeningOrganizationInfoMapper.xml | 3 +++
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/businessRecords.html | 4 ++--
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctorTemplete.html | 4 ++--
kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js | 4 ++--
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html | 10 +++++-----
10 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ScreeningOrganizationInfoMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ScreeningOrganizationInfoMapper.xml
index b7901ce..c6895dd 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ScreeningOrganizationInfoMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ScreeningOrganizationInfoMapper.xml
@@ -28,6 +28,9 @@
<if test="p.organizationName != null and p.organizationName != ''">
and organization_name = #{p.organizationName}
</if>
+ <if test="p.organizationNameLike != null and p.organizationNameLike != ''">
+ and organization_name like '%${p.organizationNameLike}%'
+ </if>
<if test="p.contactName != null and p.contactName != ''">
and contact_name = #{p.contactName}
</if>
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
index 273c0e8..3513273 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
@@ -164,14 +164,14 @@
if(doctorUserAllVo.getDepScreen()==null&&doctorUserAllVo.getDepNewScreenclient()==null){
state=1;
}
- if(doctorUserAllVo.getDepScreen().equals(0)){
+ if(doctorUserAllVo.getDepScreen()!=null&&doctorUserAllVo.getDepScreen()==0){
state=3;
}
- if(doctorUserAllVo.getDepScreen().equals(1)){
- if(doctorUserAllVo.getDepNewScreenclient().equals(1)){
+ if(doctorUserAllVo.getDepScreen()!=null&&doctorUserAllVo.getDepScreen()==1){
+ if(doctorUserAllVo.getDepNewScreenclient()!=null&&doctorUserAllVo.getDepNewScreenclient()==1){
state=2;
}
- if(doctorUserAllVo.getDepNewScreenclient().equals(0)){
+ if(doctorUserAllVo.getDepNewScreenclient()!=null&&doctorUserAllVo.getDepNewScreenclient()==0){
state=1;
}
}
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml
index 1333df5..023259d 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml
@@ -147,7 +147,7 @@
sysdep.accounts_count,
sysdep.is_del depdel,
sysdep.is_screen depScreen,
- sysdep.is_new_screenclient depNewScreenclient,
+ sysdep.is_new_screenclient depNewScreenclient
FROM sys_user sysuser
left JOIN sys_doctor sysdoctor on sysuser.id=sysdoctor.user_id
left JOIN sys_hospital syshos on sysdoctor.hospital_id=syshos.id
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js
index c15d5b8..9ad7741 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js
@@ -1,8 +1,8 @@
-// var my_api_server_url = 'http://127.0.0.1:8888/';
+ var my_api_server_url = 'http://127.0.0.1:8888/';
// var my_api_server_url = 'http://192.168.2.240:8888/';
// var my_api_server_url = 'http://open.zuul.kidgrow.cloud/';
// var my_api_server_url = 'https://zuul.kidgrow.cloud/';
-var my_api_server_url = 'https://zuul.kidgrow.cloud/';
+// var my_api_server_url = 'https://zuul.kidgrow.cloud/';
if(my_api_server_url.indexOf("http")<0)
{
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/businessRecords.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/businessRecords.html
index 17b71bd..d09e745 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/businessRecords.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/businessRecords.html
@@ -8,8 +8,8 @@
</div>
<div class="layui-card-body">
<div class="layui-form toolbar">
- <input id="app-edit-search" class="layui-input search-input" type="text" placeholder="按内容模糊查找" /> 
- <input type="text" class="layui-input search-input" id="test1" placeholder="开始时间"> 至 <input type="text"
+ <input id="app-edit-search" autocomplete="off" class="layui-input search-input" type="text" placeholder="按内容模糊查找" /> 
+ <input type="text" autocomplete="off" class="layui-input search-input" id="test1" placeholder="开始时间"> 至 <input type="text"
class="layui-input search-input" id="test2" placeholder="结束时间">  
<button id="app-btn-search" class="layui-btn icon-btn"><i class="layui-icon"></i>搜索</button>
</div>
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html
index 6272cef..2fe11e8 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html
@@ -8,7 +8,7 @@
</div>
<div class="layui-card-body">
<div class="layui-form toolbar">
- <input id="app-edit-search" class="layui-input search-input" type="text" placeholder="按医生姓名" /> 
+ <input id="app-edit-search" class="layui-input search-input" type="text" autocomplete="off" placeholder="按医生姓名" /> 
<input type="text" class="layui-input search-input" id="test1" placeholder="开始时间" > 至 <input type="text"
class="layui-input search-input" id="test2" placeholder="结束时间" >  
<button id="app-btn-search" class="layui-btn icon-btn permissions" permissions="diagnostic-get"><i class="layui-icon"></i>搜索</button>
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/departmentProduct.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/departmentProduct.html
index 37a11f5..6e5ff5e 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/departmentProduct.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/departmentProduct.html
@@ -14,10 +14,10 @@
class="layui-input search-input" id="endTime" placeholder="结束时间">  
</div>
<div class="layui-col-sm2">
- <input id="product-search-value" class="layui-input search-input" type="text" placeholder="按产品名" /> 
+ <input id="product-search-value" autocomplete="off" class="layui-input search-input" type="text" placeholder="按产品名" /> 
</div>
<div class="layui-col-sm2">
- <input id="hospital-search-value" class="layui-input search-input" type="text" placeholder="按医院名" style="width: 100%;" />
+ <input id="hospital-search-value" autocomplete="off" class="layui-input search-input" type="text" placeholder="按医院名" style="width: 100%;" />
<input type="hidden" id="hospitalId" value="">
</div>
<div class="layui-col-sm2">
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html
index 789a050..7a02a41 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html
@@ -10,14 +10,14 @@
<div class="layui-form toolbar">
<div class="layui-form-item">
<div class="layui-inline">
- <input type="text" name="date" id="datebegin" lay-verify="date" autocomplete="off"
+ <input type="text" name="date" id="datebegin" lay-verify="date"
class="layui-input search-input" /> 至 
- <input type="text" name="date" id="dateend" lay-verify="date" autocomplete="off"
+ <input type="text" name="date" id="dateend" lay-verify="date"
class="layui-input search-input" /> 
- <input id="childName" class="layui-input search-input" type="text" placeholder="按患者名" /> 
- <input id="diagnosticDoctorName" class="layui-input search-input" type="text"
+ <input id="childName" class="layui-input search-input" type="text" placeholder="按患者名" /> 
+ <input id="diagnosticDoctorName" class="layui-input search-input" autocomplete="off" type="text"
placeholder="按诊断医生名" /> 
- <input id="hospitalName" class="layui-input search-input" type="text" placeholder="按医院名,必选条件！"
+ <input id="hospitalName" class="layui-input search-input" type="text" placeholder="按医院名,必选条件！"
autocomplete="off" /></div> 
<button id="diagnostic-btn-search" class="layui-btn icon-btn permissions" permissions="diagnostic-get">
<i class="layui-icon"></i>搜索</button>
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor.html
index 26d43ab..33bea84 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor.html
@@ -10,8 +10,8 @@
<div class="layui-form toolbar">
<div class="layui-form-item">
<div class="layui-inline" style="margin-bottom: -25px;">
- <input id="doctorTel" class="layui-input search-input" type="text" placeholder="按手机号" /> 
- <input id="doctorName" class="layui-input search-input" type="text" placeholder="按医生名" /> 
+ <input id="doctorTel" class="layui-input search-input" autocomplete="off" type="text" placeholder="按手机号" /> 
+ <input id="doctorName" class="layui-input search-input" autocomplete="off" type="text" placeholder="按医生名" /> 
<select id="doctorState" lay-filter="role_clients">
<option value="">-医院状态-</option>
<option value="1">正常</option>
@@ -137,7 +137,7 @@
<label class="layui-form-label">Email</label>
<div class="layui-input-block" style="width: 150px;">
<input name="doctorEmail" type="text" class="layui-input" maxlength="50"
- lay-verify="email" autocomplete="off"/>
+ lay-verify="email" />
</div>
</div>
</div>
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctorTemplete.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctorTemplete.html
index 0604d12..9101a3f 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctorTemplete.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctorTemplete.html
@@ -19,7 +19,7 @@
<option value="0">公开-</option>
<option value="1">私有</option>
</select>
- <input name="templeteTitle" id="templeteTitle" placeholder="按标题" type="text"
+ <input name="templeteTitle" id="templeteTitle" autocomplete="off" placeholder="按标题" type="text"
class="layui-input search-input" maxlength="20" />
<button id="app-btn-search" class="layui-btn icon-btn"><i class="layui-icon"></i>搜索</button>
<button id="docto-templete-btn-add" class="layui-btn icon-btn permissions" permissions="doctortemplete-edit"><i class="layui-icon"></i>添加</button>
@@ -48,7 +48,7 @@
<div class="layui-form-item">
<label class="layui-form-label">标题</label>
<div class="layui-input-block">
- <input name="templeteTitle" type="text" class="layui-input" maxlength="20"
+ <input name="templeteTitle" autocomplete="off" type="text" class="layui-input" maxlength="20"
lay-verify="required" required/>
</div>
</div>
--
Gitblit v1.8.0