Merge branch 'doctorTemplete' into dev

zhaoxiaohao

2021-04-16 efab482471f3e3ee330fd294d9f4a459eedf78fc

Merge branch 'doctorTemplete' into dev

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/DoctorTemplete.java

@@ -1,5 +1,6 @@
package com.kidgrow.oprationcenter.model;

import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -74,7 +75,7 @@
    /**
     * 是否删除，1删除，0未删除
     */

    @TableLogic
    private Boolean isDel;
    /**
     * 状态，1启用，0停用

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/DoctorTempleteMapper.xml

@@ -114,13 +114,24 @@
            AND doctor_id IS NULL
            )
        OR (
                hospital_id =#{p.hospitalId}
                AND department_id =#{p.departmentId}
                AND (
                    public_type = 0
                    OR (
                        doctor_id =#{p.doctorId} AND public_type = 1))))
                 ORDER BY public_type DESC,id desc
                hospital_id =#{p.hospitalId}
                AND department_id =#{p.departmentId}
                AND (

                <if test="p.publicType==null or p.publicType==''">
                    public_type = 0 OR
                </if>
                (
                doctor_id =#{p.doctorId}
                <if test="p.publicType!=null and p.publicType!=''">
                    AND public_type = #{p.publicType}
                </if>
                <if test="p.templeteTitle !=null and p.templeteTitle!=''">
                    and templete_title like '%${p.templeteTitle}%'
                </if>

                ))))
                ORDER BY public_type DESC,id desc
    </select>

</mapper>

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html

@@ -11,14 +11,14 @@
            <div class="layui-form-item">
                <div class="layui-inline">
                    <input type="text" name="date" id="datebegin" lay-verify="date"
                        class="layui-input search-input" />&emsp;至&emsp;
                           class="layui-input search-input" />&emsp;至&emsp;
                    <input type="text" name="date" id="dateend" lay-verify="date"
                        class="layui-input search-input" />&emsp;
                           class="layui-input search-input" />&emsp;
                    <input id="childName" class="layui-input search-input"  type="text" placeholder="按患者名" />&emsp;
                    <input id="diagnosticDoctorName" class="layui-input search-input" autocomplete="off"  type="text"
                        placeholder="按诊断医生名" />&emsp;
                           placeholder="按诊断医生名" />&emsp;
                    <input id="hospitalName" class="layui-input  search-input"   type="text" placeholder="按医院名,必选条件！"
                        autocomplete="off" /></div>&emsp;
                           autocomplete="off" /></div>&emsp;
                <button id="diagnostic-btn-search" class="layui-btn icon-btn permissions"  permissions="diagnostic-get">
                    <i class="layui-icon">&#xe615;</i>搜索</button>

@@ -74,10 +74,16 @@
                { field: 'diagnosticDepartName', width: "10%", title: '科室名称' },
                { field: 'diagnosticDoctorName', width: "10%", title: '医生姓名' },
                { field: 'childName', width: "10%", title: '患者姓名' },
                { field: 'childSex', width: "10%", title: '性别' },
                { field: 'childSex', width: "10%", title: '性别',templet:function(d){
                        if(d.childSex==0){
                            return "男";
                        }else if(d.childSex==1){
                            return "女";
                        }
                    } },
                { field: 'childBirthday', width: "10%", title: '出生日期',templet:function(d){
                    return new Date(d.createTime).dateFormat("yyyy-MM-dd");
                }},
                        return new Date(d.childBirthday).dateFormat("yyyy-MM-dd");
                    }},
                { field: 'childPhone', width: "10%", title: '联系电话' },
                {
                    field: 'isDeleted', sort: true, align: 'center', width: 100, templet: function (d) {
@@ -98,7 +104,10 @@
                },
                {
                    field: 'updateTime', width: "10%", sort: true, title: '修改时间', templet: function (d) {
                        return new Date(d.createTime).dateFormat("yyyy-MM-dd hh:mm");
                        if(d.updateTime==null){
                            return "";
                        }
                        return new Date(d.updateTime).dateFormat("yyyy-MM-dd hh:mm");
                    }
                },
                { field: 'enabled', width: "10%", templet: '#diagnostic-table-bar', title: '查看' }
@@ -138,7 +147,7 @@
        });
        //获取软件的服务周期
        var getCycleTime = function (departmentId) {
            

        }
        // 工具条点击事件
        table.on('tool(diagnostic-table)', function (obj) {
@@ -146,15 +155,15 @@
            var layEvent = obj.event;
            if (layEvent === "select") {
                admin.req('api-opration/productorderrecord/pdfname/'+data.diagnosticId+"/0/"+data.diagnosticHospitalId+"/"+data.diagnosticDepartId, {},
                function (data) {
                    if (data.code == 0) {
                        //打开新的窗口
                       window.open(data.data)
                    }else{
                        layer.msg("查询报告失败")
                    }
                    function (data) {
                        if (data.code == 0) {
                            //打开新的窗口
                            window.open(data.data)
                        }else{
                            layer.msg("查询报告失败")
                        }

                }, "post")
                    }, "post")
                admin.re
            }
        });

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor_form.html

@@ -6,7 +6,7 @@
                <label class="layui-form-label" style="width: 75px;">所在医院</label>
                <div class="layui-input-block" style="width: 150px;">
                    <input name="hospitalName" id="hospitalName" placeholder="请输入医院名称" type="text" class="layui-input"
                        maxlength="50" lay-verify="required" required style="width: 150px;" />
                           maxlength="50" lay-verify="required" required style="width: 150px;" />
                    <input type="hidden" name="hospitalId" id="hospitalId" />
                    <input type="hidden" name="id" id="id" />
                </div>
@@ -15,9 +15,9 @@
                <label class="layui-form-label">科室</label>
                <div class="layui-input-block" style="width: 150px;">
                    <input name="departmentName" id="departmentName" placeholder="请选择科室" type="hidden"
                        class="layui-input" maxlength="20" />
                           class="layui-input" maxlength="20" />
                    <select id="departmentId" name="departmentId" lay-filter="departmentId" placeholder="请选择科室"
                        lay-verify="required" required>
                            lay-verify="required" required>
                        <option value="">-请选择科室-</option>
                    </select>
                </div>
@@ -40,14 +40,14 @@
                <label class="layui-form-label">姓名</label>
                <div class="layui-input-block" style="width: 150px;">
                    <input name="doctorName" type="text" class="layui-input" maxlength="20" lay-verify="required"
                        required style="width: 150px;" />
                           required style="width: 150px;" />
                </div>
            </div>
            <div class="layui-inline">
                <label class="layui-form-label">职称</label>
                <div class="layui-input-block" style="width: 150px;">
                    <select id="doctorRankId" name="doctorRankId" lay-filter="doctorRankId" placeholder="选择一个职称"
                        lay-verify="required" required>
                            lay-verify="required" required>
                        <option value="">-请选择-</option>
                    </select>
                    <input name="doctorRank" id='doctorRank' type="hidden" class="layui-input" maxlength="20" />
@@ -57,7 +57,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="v_email"
                    autocomplete="off"  />
                           autocomplete="off"  />
                </div>
            </div>
        </div>
@@ -68,7 +68,7 @@
                <label class="layui-form-label">联系电话</label>
                <div class="layui-input-block" style="width: 150px;">
                    <input name="doctorTel" id="doctorTel-add" type="text" class="layui-input" maxlength="20"
                        lay-verify="required|phone" required style="width: 150px;" />
                           lay-verify="required|phone" required style="width: 150px;" />
                </div>
            </div>
            <div class="layui-inline">
@@ -91,7 +91,7 @@
            <label class="layui-form-label">医生简介</label>
            <div class="layui-input-block" >
                <textarea name="doctorAbout" id="doctorAbout" class="layui-textarea" maxlength="300"
                    style="width: 697px;"></textarea>
                          style="width: 697px;"></textarea>
            </div>
        </div>
    </div>
@@ -100,9 +100,9 @@
            <label class="layui-form-label">医生状态</label>
            <div class="layui-input-block">
                <input name="doctorState" id="doctorState-shi" type="radio" checked value="true" title="正常"
                    class="layui-input" />
                       class="layui-input" />
                <input name="doctorState" id="doctorState-fou" type="radio" value="false" title="试用"
                    class="layui-input" />
                       class="layui-input" />
            </div>
        </div>
        <div class="layui-form-item">
@@ -116,7 +116,7 @@
            <label class="layui-form-label">医答</label>
            <div class="layui-input-block">
                <input name="isAnswer" id="isAnswer-shi" type="radio" checked value="true" title="是"
                    class="layui-input" />
                       class="layui-input" />
                <input name="isAnswer" id="isAnswer-fou" type="radio" value="false" title="否" class="layui-input" />
            </div>
        </div>
@@ -124,7 +124,7 @@
            <label class="layui-form-label">签约</label>
            <div class="layui-input-block">
                <input name="isSigning" id="isSigning-shi" type="radio" checked value="true" title="是"
                    class="layui-input" />
                       class="layui-input" />
                <input name="isSigning" id="isSigning-fou" type="radio" value="false" title="否" class="layui-input" />
            </div>
        </div>
@@ -152,7 +152,7 @@

            <!-- </div>
        <div class="layui-form-item">
            

        </div>
        <div class="layui-form-item"> -->

@@ -177,14 +177,14 @@
                <label class="layui-form-label">销售代表</label>
                <div class="layui-input-block" style="width: 150px;">
                    <input name="serverUserName" id="serverUserName-add" type="hidden" class="layui-input"
                        maxlength="15" />
                           maxlength="15" />
                    <select id="serverUserId-add" name="serverUserId" lay-filter="serverUserId-add"
                        lay-verify="required" required>
                            lay-verify="required" required>
                        <option value="">-请选择-</option>
                    </select>
                </div>
            </div>
            <!--             
            <!--
        </div>

        <div class="layui-form-item"> -->
@@ -195,7 +195,7 @@
    <div class="layui-form-item model-form-footer">
        <button class="layui-btn layui-btn-primary" ew-event="closeDialog" type="button">取消</button>
        <button class="layui-btn permissions" permissions="sysdoctor-edit" id="sure" lay-filter="user-form-submit"
            lay-submit>保存</button>
                lay-submit>保存</button>
    </div>
</form>

@@ -350,11 +350,11 @@
                    }
                }
                data.field.roles.forEach(element => {
                element = "" + element
            });
                    element = "" + element
                });
            }
            data.field.roleId = null;
            

            layer.load(2);
            admin.req('api-user/sysdoctor', JSON.stringify(data.field), function (data) {
                layer.closeAll('loading');
@@ -509,7 +509,7 @@
            });
            //将密码隐藏
            $(".account").hide();
            //将密码置空 
            //将密码置空
            $("#password").val("");
            form.render();
            //医生类型的选择事件
@@ -530,7 +530,7 @@
        $("#username").blur(function () {
            if (!validatorTel(doctorTel_add)) {
                layer.msg("请输入正确的手机号");
                

            } else {
                username_is_usered("username");
            }
@@ -632,8 +632,16 @@
            $("#password").removeAttr("lay-verify")
            $("#password").removeAttr("required")
            $("#passwordSure").removeAttr("lay-verify")
            
            

            $("#doctorState-shi").attr("checked", doctor.doctorState? true : false);
            $("#doctorState-fou").attr("checked", !doctor.doctorState ? true : false);
            $("#isTop-shi").attr("checked", doctor.isTop? true : false);
            $("#isTop-fou").attr("checked", !doctor.isTop ? true : false);
            $("#isAnswer-shi").attr("checked", doctor.isAnswer? true : false);
            $("#isAnswer-fou").attr("checked", !doctor.isAnswer ? true : false);

            $("#isSigning-shi").attr("checked", doctor.isSigning? true : false);
            $("#isSigning-fou").attr("checked", !doctor.isSigning ? true : false);
            form.render();
        } else {
            loadEditData();