Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

# Conflicts:
#	patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/specialty/index.jsp

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/desizenMan/service_project_management.jsp

@@ -645,7 +645,7 @@
                    shadeClose: true,
                    shade: 0.8,
                    area: ['1020px', '700px'],
                    content: '/admin/specialist/hospitalServiceItem/initial1' //iframe的url
                    content: ctx + '/admin/specialist/hospitalServiceItem/initial1' //iframe的url
				})
			})
//			获取检查费(项目机构)

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/specialty/index.jsp

@@ -215,7 +215,7 @@
            </div>
        </div>
    </div>
    <div class="lay-box-3" >
    <div class="lay-box-3" style="display:none">
        <div class="lay">
            <div class="title flex flex-sp-b flex-cz-c">
                <span>批量导入</span>
@@ -707,12 +707,7 @@
                    method: "post",
                    dataType: "json",
                    async: true,
                    data: {
                        formData:formData,
                        contentType: false,
                        cache: false,
                        processData: false
                    },
                    data: {serviceItem: r},
                    success:function (res) {
                        console.log(res)
                        if (res.status == 200){
@@ -930,24 +925,6 @@
            var formData = new FormData()
			formData.append('file', file)
            console.log(formData)
            $.ajax({
                url: ctx + "/admin/specialist/serviceItem/updateServiceItem",
                method: "post",
                dataType: "json",
                async: true,
                data: {serviceItem: r},
                success:function (res) {
                    console.log(res)
                    if (res.status == 200){
                        layer.alert('操作成功!', {
                            icon: 1,
                        },function () {
                            layer.closeAll();
                            init();
                        })
                    }
                }
            })
        }
    </script>
</body>

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/specialist/SpecialistService.java

@@ -41,10 +41,7 @@ import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
 * Created by Trick on 2018/5/31.
@@ -862,5 +859,24 @@ public class SpecialistService extends BaseService {
        }
        throw new Exception("请求获取居民信息失败！");
    }
    public List<Map<String,Object>> findPatientSignFamily(String patient) throws Exception {
        SignFamily signFamily = signFamilyDao.findSignFamilyByPatient(patient);
        List<Map<String,Object>> resultList = new ArrayList<>();
        if(signFamily!=null){
            Map<String,Object> map = new HashMap<>();
            map.put("doctorName",signFamily.getDoctorHealthName());
            map.put("doctorCode",signFamily.getDoctorHealth());
            map.put("doctorType","健管师");
            resultList.add(map);
            map = new HashMap<>();
            map.put("doctorName",signFamily.getDoctorName());
            map.put("doctorCode",signFamily.getDoctor());
            map.put("doctorType","全科医生");
            resultList.add(map);
        }
        return resultList;
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/specialist/SpecialistController.java

@@ -392,4 +392,15 @@ public class SpecialistController extends WeixinBaseController {
        }
    }
    @RequestMapping(value = "/findPatientSignFamily", method = RequestMethod.GET)
    @ApiOperation(value = "获取居民所有专科医生签约信息")
    public String findPatientSignFamily(@ApiParam(name = "patient", value = "居民code") @RequestParam(required = true)String patient) throws Exception {
        try {
            return write(200, "获取成功", "data", specialistService.findPatientSignFamily(patient));
        } catch (Exception e) {
            error(e);
            return error(-1, "请求失败");
        }
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/specialist/rehabilitation/DoctorRehabilitationManageController.java

@@ -93,7 +93,7 @@ public class DoctorRehabilitationManageController extends BaseController {
                                     @RequestParam(value = "executeEndTime", required = true)String executeEndTime,
                                     @ApiParam(name = "planId", value = "计划id", required = true)
                                     @RequestParam(value = "planId", required = true)String planId,
                                     @ApiParam(name = "searchTask", value = "快速查找任务：（1、我的任务，2、随访，3、复诊，4、健康教育）", required = false)
                                     @ApiParam(name = "searchTask", value = "快速查找任务：（1、我的任务，2、健康教育，3、复诊，4、随访）", required = false)
                                     @RequestParam(value = "searchTask", required = false)Integer searchTask,
                                     @ApiParam(name = "doctorCode", value = "医生code（专科医生、家庭医生）", required = false)
                                     @RequestParam(value = "doctorCode", required = false)String doctorCode,
@@ -120,7 +120,7 @@ public class DoctorRehabilitationManageController extends BaseController {
                                     @RequestParam(value = "executeEndTime", required = true)String executeEndTime,
                                     @ApiParam(name = "planId", value = "计划id", required = true)
                                     @RequestParam(value = "planId", required = true)String planId,
                                     @ApiParam(name = "searchTask", value = "快速查找任务：（1、我的任务，2、随访，3、复诊，4、健康教育）", required = false)
                                     @ApiParam(name = "searchTask", value = "快速查找任务：（1、我的任务，2、健康教育，3、复诊，4、随访）", required = false)
                                     @RequestParam(value = "searchTask", required = false)Integer searchTask,
                                     @ApiParam(name = "doctorCode", value = "医生code（专科医生、家庭医生）", required = false)
                                     @RequestParam(value = "doctorCode", required = false)String doctorCode,

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/specialist/rehabilitation/PatientRehabilitationManageController.java

@@ -58,7 +58,7 @@ public class PatientRehabilitationManageController extends BaseController {
                                     @RequestParam(value = "executeEndTime", required = true)String executeEndTime,
                                     @ApiParam(name = "planId", value = "计划id", required = true)
                                     @RequestParam(value = "planId", required = true)String planId,
                                     @ApiParam(name = "searchTask", value = "快速查找任务：（1、我的任务，2、随访，3、复诊，4、健康教育）", required = false)
                                     @ApiParam(name = "searchTask", value = "快速查找任务：（1、我的任务，2、健康教育，3、复诊，4、随访）", required = false)
                                     @RequestParam(value = "searchTask", required = false)Integer searchTask,
                                     @ApiParam(name = "status", value = "任务状态（0未完成，1已完成，2已预约）", required = false)
                                     @RequestParam(value = "status", required = false)Integer status){
@@ -93,7 +93,7 @@ public class PatientRehabilitationManageController extends BaseController {
                                         @RequestParam(value = "executeEndTime", required = true)String executeEndTime,
                                         @ApiParam(name = "planId", value = "计划id", required = true)
                                         @RequestParam(value = "planId", required = true)String planId,
                                         @ApiParam(name = "searchTask", value = "快速查找任务：（1、我的任务，2、随访，3、复诊，4、健康教育）", required = false)
                                         @ApiParam(name = "searchTask", value = "快速查找任务：（1、我的任务，2、健康教育，3、复诊，4、随访）", required = false)
                                         @RequestParam(value = "searchTask", required = false)Integer searchTask,
                                         @ApiParam(name = "status", value = "任务状态（0未完成，1已完成，2已预约）", required = false)
                                         @RequestParam(value = "status", required = false)Integer status){