Merge branch 'master' of http://192.168.1.220:10080/raolu/PC-application

app/rehabilitation/css/health_control.css

@@ -264,7 +264,7 @@ li {
.datab {
    width: 633px;
    width: 693px;
    justify-content: center;
}

app/rehabilitation/html/moreplan.html

@@ -30,127 +30,125 @@
            </ul>
            <!-- henfu -->
            <div class="henfu">
                <div class="data flex-box" v-for="(dat, index) in patientlist">
                    <div class="dataa">
                        <div class="quote"></div>
                        <div class="dataatop">
                            <div class="dac flex-box">
                                <p>
                               <img :src="setImgSrc(dat.patientPhoto)" width="40" height="40" class="c-images-cycle" />
                                </p>
                                <div class="xinxi">
                                    <div class="xinxitop flex-box">
                                            <p><span style="color:#333333;">{{dat.patientName}}</span>&#x3000;({{dat.sex}}{{dat.age}}岁)
                                                </p>
                                                <p class="biaoqian">
                                                    <span></span>康复期
                                                </p>
                <div v-for="(dat, index) in patientlist">
                    <div class="data flex-box">
                            <div class="dataa">
                                    <div class="quote"></div>
                                    <div class="dataatop">
                                        <div class="dac flex-box">
                                            <p>
                                           <img :src="setImgSrc(dat.patientPhoto)" width="40" height="40" class="c-images-cycle" />
            
                                            </p>
                                            <div class="xinxi">
                                                <div class="xinxitop flex-box">
                                                        <p><span style="color:#333333;">{{dat.patientName}}</span>&#x3000;({{dat.sex}}{{dat.age}}岁)
                                                            </p>
                                                            <p class="biaoqian">
                                                                <span></span>康复期
                                                            </p>
                                                </div>
                                              
                                                <p>{{dat.hospital}}</p>
                                            </div>
            
            
                                        </div>
            
                                        <div class="dataabom">
                                            <p>疾病类型:</p>
                                            <p v-for="(data1, index) in dat.diseaseList" class="inline-block">{{data1}}</p>
                                        </div>
                                    </div>
                                  
                                    <p>{{dat.hospital}}</p>
            
            
                                </div>
                            </div>
                            <div class="dataabom">
                                <p>疾病类型:</p>
                                <p v-for="(data1, index) in dat.diseaseList" class="inline-block">{{data1}}</p>
                            </div>
                        </div>
                    </div>
                    <div class="datab flex-box">
                        <div class="doc fdoctor">
                            <div class="fdt flex-box">
                                <img src="../../../images/moren_yishengqun_img .jpg" width="40" height="40" class="c-images-cycle">
                                <div class="miaoshu cgre">
                                    <p>
                                        <span>家庭医生</span>&nbsp;{{dat.signFamilyAdminTeamName}}</p>
                                    <p class="mt10">{{dat.familyHospitalName}}</p>
                                <div class="datab flex-box">
                                    <div class="doc fdoctor">
                                        <div class="fdt flex-box">
                                            <img src="../../../images/moren_yishengqun_img .jpg" width="40" height="40" class="c-images-cycle">
                                            <div class="miaoshu cgre">
                                                <p>
                                                    <span>家庭医生</span>&nbsp;{{dat.signFamilyAdminTeamName}}</p>
                                                <p class="mt10">{{dat.familyHospitalName}}</p>
            
                                            </div>
                                        </div>
                                        <div class="fdb flex-box">
                                            <p>完成项目
                                                <span>{{dat.signFamilyFinishItemCount}}</span>
                                            </p>
                                            <p>服务记录
                                                <span>{{dat.signFamilyServiceRecordCount}}</span>
                                            </p>
            
                                        </div>
                                    </div>
                                    <div class="doc sdoctor">
                                        <div class="fdt flex-box">
                                            <img src="../../../images/moren_yishengqun_img .jpg" width="40" height="40" class="c-images-cycle">
                                            <div class="miaoshu cgre">
                                                <p>
                                                    <span>专科医生</span>&nbsp;{{dat.specialistAdminTeamName}}</p>
                                                <p class="mt10">{{dat.specialistHospitalName}}</p>
            
                                            </div>
                                        </div>
                                        <div class="fdb flex-box">
                                            <p>完成项目
                                                <span>{{dat.specialistFinishItemCount}}</span>
                                            </p>
                                            <p>服务记录
                                                <span>{{dat.specialistServiceRecordCount}}</span>
                                            </p>
            
                                        </div>
                                    </div>
                                </div>
                            </div>
                            <div class="fdb flex-box">
                                <p>完成项目
                                    <span>{{dat.signFamilyFinishItemCount}}</span>
                                </p>
                                <p>服务记录
                                    <span>{{dat.signFamilyServiceRecordCount}}</span>
                                </p>
                            </div>
                        </div>
                        <div class="doc sdoctor">
                            <div class="fdt flex-box">
                                <img src="../../../images/moren_yishengqun_img .jpg" width="40" height="40" class="c-images-cycle">
                                <div class="miaoshu cgre">
                                    <p>
                                        <span>专科医生</span>&nbsp;{{dat.specialistAdminTeamName}}</p>
                                    <p class="mt10">{{dat.specialistHospitalName}}</p>
                                <div class="datad flex-box">
                                    <button class="falsebutton" @click=noOpen()>健康指导</button>
                                    <button class="falsebutton" @click=noOpen()>随访</button>
                                    <button class="falsebutton" @click=noOpen()>复诊预约</button>
                                </div>
                    </div>
                       <!-- 细节点 -->
                       <div class="detail flex-box" v-for="(data, index) in dat.rehabilitationPlanList">
                            <div class="detaila flex-box">
                                <div class="quote2"></div>
                                {{data.planTypeName}}
                            </div>
                            <div class="detailb flex-box">
                                <span class="cblue" :id="'span_font'+data.planId">进行中</span>
                                <div class="layui-progress layui-progress-big" :lay-filter="data.planId" lay-showpercent="true">
                                        <div class="layui-progress-bar" :id="'progress_'+data.planId" lay-percent="">
                                        </div>
                                </div> 
        
                                <span class="cgre">{{data.allFinishCount}}/</span>
                                <span class="cgre">{{data.allCount}}</span>
                            </div>
                            <div class="fdb flex-box">
                                <p>完成项目
                                    <span>{{dat.specialistFinishItemCount}}</span>
                            <div class="detailc flex-box">
                                <p class="cred">今日项目:
                                    <span>{{data.todayBacklogCount}}</span>
                                </p>
                                <p>服务记录
                                    <span>{{dat.specialistServiceRecordCount}}</span>
                                <p class="cgre">已完成:
                                    <span>{{data.finishedCount}}</span>
                                </p>
                                <p class="cgre">未完成:
                                    <span>{{data.unfinishedCount}}</span>
                                </p>
                            </div>
                        </div>
                    </div>
                    <div class="datad flex-box">
                        <button class="falsebutton" @click=noOpen()>健康指导</button>
                        <button class="falsebutton" @click=noOpen()>随访</button>
                        <button class="falsebutton" @click=noOpen()>复诊预约</button>
                    </div>
                </div>
                <!-- 细节点 -->
                <div class="detail flex-box" v-for="(data, index) in tablelist">
                    <div class="detaila flex-box">
                        <div class="quote2"></div>
                        {{data.planTypeName}}
                    </div>
                    <div class="detailb flex-box">
                        <span class="cblue" :id="'span_font'+data.planId">进行中</span>
                        <!-- <div class="layui-progress layui-progress-big" :lay-filter="data.planId" lay-showpercent="true">
                            <div class="layui-progress-bar" lay-percent="">
                            <div class="detaild">
                                <a href="javascript: void(0)" @click="checkPatient()">查看患者</a>
                                <a href="javascript: void(0)" @click="checkPlan(data)">查看计划</a>
                                <a href="javascript: void(0)"  @click="stop(data)" :id="'stopBtn_'+data.planId">中止计划</a>
        
        
                            </div>
                        </div> -->
                        <div class="layui-progress layui-progress-big" :lay-filter="data.planId" lay-showpercent="true">
                                <div class="layui-progress-bar" :id="'progress_'+data.planId" lay-percent="">
                                </div>
                        </div> 
                        <span class="cgre">{{data.allFinishCount}}/</span>
                        <span class="cgre">{{data.allCount}}</span>
                    </div>
                    <div class="detailc flex-box">
                        <p class="cred">今日项目:
                            <span>{{data.todayBacklogCount}}</span>
                        </p>
                        <p class="cgre">已完成:
                            <span>{{data.finishedCount}}</span>
                        </p>
                        <p class="cgre">未完成:
                            <span>{{data.unfinishedCount}}</span>
                        </p>
        
                    </div>
                    <div class="detaild">
                        <a href="javascript: void(0)" @click="checkPatient()">查看患者</a>
                        <a href="javascript: void(0)" @click="checkPlan(data)">查看计划</a>
                        <a href="javascript: void(0)"  @click="stop(data)" :id="'stopBtn_'+data.planId">中止计划</a>
                    </div>
                </div>
               
            </div>
        </div>

app/rehabilitation/js/health_control.js

@@ -88,7 +88,7 @@ layui.use('element', function () {
            isStop: 1, //
            isActive: true,
            doctorType: "",
            docCode:"",
            docCode: "",
            docInfo: [],
            isLeader: 0,
            planCreateUser: ""
@@ -106,8 +106,8 @@ layui.use('element', function () {
                        var isStop = val[i].status
                        var ishospitalName = val[i].hospitalName
                        vm.planCreateUser = val[i].planCreateUser
                      
                      
                        if (ishospitalName == null) {
                            $("#hospitalName_" + val[i].id).html("暂无社区信息")
                        }
@@ -207,22 +207,27 @@ layui.use('element', function () {
                        vm.docInfo = JSON.parse(window.localStorage.getItem('wlyyAgent'))
                        vm.doctorType = vm.docInfo.doctorType
                        if (vm.doctorType !== 1) {
                            $(".neironglef>button").attr('disabled', "true")
                            $(".neironglef>button").addClass("falsebutton")
                            $(".neironglef>button").css("color", "white")
                        if (vm.doctorType != 1) {
                            $(".neironglef>button:nth-child(1)").attr('disabled', "true")
                            $(".neironglef>button:nth-child(1)").addClass("falsebutton")
                            $(".neironglef>button:nth-child(1)").css("color", "white")
                        }
                        healthAPI.doctorBaseinfo().then(function (res) {
                            vm.isLeader = res.data.isLeader
                            for(var i=0;i<vm.tablelist.length;i++){
                            for (var i = 0; i < vm.tablelist.length; i++) {
                                if (vm.isLeader == 0) {
                                    $("#stopBtn_" + vm.tablelist[i].id).attr('disabled', "true")
                                    $("#stopBtn_" + vm.tablelist[i].id).addClass("falsebutton")
                                    $(".neironglef>button:nth-child(2)").attr('disabled', "true")
                                    $(".neironglef>button:nth-child(2)").addClass("falsebutton")
                                    $(".neironglef>button:nth-child(2)").css("color", "white")
                                }
            
                            }
                           
                        })
@@ -232,9 +237,9 @@ layui.use('element', function () {
                    }
                })
            
              
            },
@@ -330,8 +335,8 @@ layui.use('element', function () {
                location.href = "../../rehabilitation/html/rehabilitation_management.html?planId=" + data.id
            },
            modelControl:function(){
                location.href = "../../rehabilitation/html/management.html" 
            modelControl: function () {
                location.href = "../../rehabilitation/html/management.html"
            }

app/rehabilitation/js/moreplan.js

@@ -79,67 +79,78 @@ layui.use('element', function () {
            patientPhoto: "",
            doctorType: "",
            docInfo: [],
            patientlist:[],
            docInfo:[],
            patientlist: [],
            docInfo: [],
        },
        watch: {
            tablelist: function (val) {
            patientlist: function (val) {
                this.$nextTick(function () {
                    element.init()
                    var vm=this
                    var vm = this
                    for (var i = 0; i < val.length; i++) {
                        var allFinishCount = val[i].allFinishCount
                        var allCount = val[i].allCount
                        var isStop = val[i].status
                        var ishospitalName = val[i].hospitalName
                        for (var i = 0; i < val.length; i++){
                            var isOperator=val[i].isOperator
                            if (isOperator==0) {
                                console.log('aa')
                                $("#stopBtn_" + val[i].planId).attr('disabled', 'true')
                                $("#stopBtn_" + val[i].planId).css("pointer-events", "none")
                                $("#stopBtn_" + val[i].planId).css("color","#999999")
                                    
                            }
                        if (ishospitalName == null) {
                            $("#hospitalName_" + val[i].planId).html("暂无社区信息")
                        }
                        if (isStop == 2) {
                            $("#span_font" + val[i].planId).html("已完成")
                            $("#span_font" + val[i].planId).addClass("corg")
                        }
                        if (isStop == 1) {
                            $("#span_font" + val[i].planId).html("进行中")
                            $("#span_font" + val[i].planId).addClass("cblue")
                        for (var j = 0; j < val[i].rehabilitationPlanList.length; j++) {
                            var obj = val[i].rehabilitationPlanList[j]
                            var isOperator = obj.isOperator
                            var allFinishCount = obj.allFinishCount
                            var allCount = obj.allCount
                            var isStop = obj.status
                            var ishospitalName = val[i].hospitalName
                                if (isOperator == 0) {
                                    $("#stopBtn_" + obj.planId).attr('disabled', 'true')
                                    $("#stopBtn_" + obj.planId).css("pointer-events", "none")
                                    $("#stopBtn_" + obj.planId).css("color", "#999999")
                                }
                                if (ishospitalName == null) {
                                    $("#hospitalName_" + obj.planId).html("暂无社区信息")
                                }
                                if (isStop == 2) {
                                    $("#span_font" + obj.planId).html("已完成")
                                    $("#span_font" + obj.planId).css("color","#ff9526")
                                }else{
                                    if (isStop == 1) {
                                        $("#span_font" + obj.planId).html("进行中")
                                        $("#span_font" + obj.planId).css("color","#12b7f5")
    
                                    }
                                    if (isStop == 0) {
                                        $("#span_font" + obj.planId).html("已中止")
                                        $("#span_font" + obj.planId).css("color","#999999")
                                        $("#progress_" + obj.planId).css({
                                            "background-color": "gray"
                                        })
                                        $("#stopBtn_" + obj.planId).html("激活计划")
                                    } else {
                                        $("#progress_" + obj.planId).css({
                                            "background-color": "#ff9526"
                                        })
                                        $("#stopBtn_" + obj.planId).html("中止计划")
                                     
                                    }
                                }
                              
                                if(allCount==0){
                                    Progress(obj.planId, 0 + "%")
                                }else{
                                    var progressNum = Math.ceil((allFinishCount / allCount) * 100)
                                    Progress(obj.planId, progressNum + "%")
                                
                                }
                             
                        }
                        if (isStop == 0) {
                            $("#span_font" + val[i].planId).html("已中止")
                            $("#span_font" + val[i].planId).addClass("cgre")
                            $("#progress_" + val[i].planId).css({
                                "background-color": "gray"
                            })
                            $("#stopBtn_" + val[i].planId).html("激活计划")
                        } else {
                            $("#progress_" + val[i].planId).css({
                                "background-color": "#ff9526"
                            })
                            $("#stopBtn_" + val[i].planId).html("中止计划")
                        }
                        var progressNum = Math.ceil((allFinishCount / allCount) * 100)
                        Progress(val[i].planId, progressNum + "%")
                    }
                }
                })
            }
           
        },
        mounted() {
            var vm = this
@@ -180,18 +191,11 @@ layui.use('element', function () {
                        vm.name = res.data.patientName
                        vm.sex = res.data.sex
                        vm.age = res.data.age
                        vm.patientlist=res.data
                        vm.patientlist = res.data
                        vm.patientPhoto = res.data.patientPhoto
                        vm.hospital = res.data.hospitalName
                        vm.docInfo = JSON.parse(window.localStorage.getItem('wlyyAgent'))
                        console.log(res.data.length)
                        for(var i=0;i<res.data.length;i++){
                        //  vm.diseaseList = res.data[i].diseaseList
                        vm.tablelist = _.sortBy(res.data[i].rehabilitationPlanList, "patientName")
                        console.log(vm.diseaseList)
                        }
                        vm.signFamilyServiceRecordCount = res.data.signFamilyServiceRecordCount
                        vm.signFamilyFinishItemCount = res.data.signFamilyFinishItemCount
                        vm.signFamilyAdminTeamName = res.data.signFamilyAdminTeamName
@@ -203,10 +207,10 @@ layui.use('element', function () {
                        if (vm.tablelist.length == 0) {
                            vm.wujilu = true
                        }
                        vm.doctorType= vm.docInfo.doctorType
                        
                      
                     
                        vm.doctorType = vm.docInfo.doctorType
                    } else {
                        // showErrorMessage(res.msg);
                    }
@@ -234,11 +238,11 @@ layui.use('element', function () {
                    title: '服务项目内容',
                    fixed: true, //不固定
                    maxmin: true,
                    closeBtn:1,
                    closeBtn: 1,
                    shift: 5,
                    shadeClose: false, //点击遮罩关闭层
                    content: '../../temporary/html/userInfo.html?patient='+vm.paticentcode
                  });
                    content: '../../temporary/html/userInfo.html?patient=' + vm.paticentcode
                });
                // location.href = "" + 
            },

component/rehabilitation/item-detail.js

@@ -31,7 +31,8 @@ var ItemDetail = {
        return {
        	item: {
        		specialistServiceItemDO: {},
        		hospitalName: ""
        		hospitalName: "",
        		hospitalDo: {}
        	},
        	itemTypes: ["","康复服务","健康服务"],
        	itemId: ""

component/rehabilitation/new-template-form.js

@@ -15,6 +15,11 @@ var NewTemplateForm = {
        	name:''
        }
    },
    beforeRouteEnter: function (to, from, next) {
	    next(function(vm) {
	    	vm.name = ""
	    })
	},
    mounted: function() {
    	var vm = this