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

@@ -117,9 +117,20 @@
                hospital_id =#{p.hospitalId}
                AND department_id =#{p.departmentId}
                AND (
                    public_type = 0
                    OR (
                        doctor_id =#{p.doctorId} AND public_type = 1))))

                <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>


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

@@ -74,9 +74,15 @@
                { 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: '联系电话' },
                {
@@ -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: '查看' }

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

@@ -633,7 +633,15 @@
            $("#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();