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> 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; } } 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 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) { 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> 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> 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"> 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> 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> 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>