Merge branch 'dev' of trick9191/patient-co-management into dev

patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/doctor/SignPatientLabelDao.java

@@ -33,6 +33,7 @@ public interface SignPatientLabelDao extends
     * @param status
     * @return
     */
    @Query("select a from SignPatientLabel a where a.labelType = ?1 and a.status = ?2 ORDER BY a.sort ASC ")
    List<SignPatientLabel> findByLabelTypeAndStatus(String labelType,Integer status);
    /**

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/FamilyContractService.java

@@ -1197,7 +1197,9 @@ public class FamilyContractService extends BaseService {
            sf.setExpensesType(StringUtils.isEmpty(expenses) ? "01" : expenses);//收费类别
            sf.setAdminTeamId(adminTeamCode);
            //设置服务类型1.3.3.2版本更新
            signWebService.setSevId(sf,sevId);
            if(StringUtils.isNotBlank(sevId)){
                signWebService.setSevId(sf,sevId);
            }
            if (StringUtils.isNotEmpty(doctor)) {
                //设置全科医生
                sf.setDoctor(doctor);

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/SignWebService.java

@@ -1004,23 +1004,25 @@ public class SignWebService extends BaseService {
                        renew.setStatus(-2);
                    } else if ("1".equals(state)) {
                        renew.setStatus(1);
                        //1.3.3.2新增需求
                        //设置居民服务类型
                        if(StringUtils.isNotBlank(sevId)){
                            setSevId(renew,sevId);
                        }
                        //1.3.3.2新增需求
                        //设置居民标签
                        signPatientLabelInfoService.setRenewPatientLabels(renew.getPatient(), health, disease,custom, renew.getDoctor(),renew.getDoctor());
                        //1.3.3.2设置可修改健康管理师
                        if(StringUtils.isNotBlank(healthDoctor)){
                            setHealthDoctor(renew,healthDoctor);
                        }
                        //1.3.3.2设置新团队
                        if(teamCode!=null&&teamCode!=0){
                            renew.setAdminTeamId(teamCode);
                        }
                    }
                }
                renew.setApplyDate(new Date());
                //1.3.3.2新增需求
                //设置居民服务类型
                setSevId(renew,sevId);
                //1.3.3.2新增需求
                //设置居民标签
                signPatientLabelInfoService.setRenewPatientLabels(renew.getPatient(), health, disease,custom, renew.getDoctor(),renew.getDoctor());
                //1.3.3.2设置可修改健康管理师
                if(StringUtils.isNotBlank(healthDoctor)){
                    setHealthDoctor(renew,healthDoctor);
                }
                //1.3.3.2设置新团队
                if(teamCode!=null&&teamCode!=0){
                    renew.setAdminTeamId(teamCode);
                }
                signFamilyRenewDao.save(renew);
@@ -1135,25 +1137,24 @@ public class SignWebService extends BaseService {
                        renew.setStatus(-2);
                    } else if ("1".equals(state)) {
                        renew.setStatus(1);
                        //1.3.3.2新增需求
                        //设置居民服务类型
                        setSevId(renew,sevId);
                        //1.3.3.2新增需求
                        //设置居民标签
                        signPatientLabelInfoService.setPatientLabels(renew.getPatient(), renew.getIdcard(),"", health, disease, custom, renew.getDoctor(), renew.getDoctor());
                        //1.3.3.2设置可修改健康管理师
                        if(StringUtils.isNotBlank(healthDoctor)){
                            setHealthDoctor(renew,healthDoctor);
                        }
                        //1.3.3.2设置新团队
                        if(teamCode!=null&&teamCode!=0){
                            renew.setAdminTeamId(teamCode);
                        }
                    }
                }
                renew.setApplyDate(new Date());
                //1.3.3.2新增需求
                //设置居民服务类型
                setSevId(renew,sevId);
                //1.3.3.2新增需求
                //设置居民标签
                signPatientLabelInfoService.setPatientLabels(renew.getPatient(), renew.getIdcard(),"", health, disease, custom, renew.getDoctor(), renew.getDoctor());
                //1.3.3.2设置可修改健康管理师
                if(StringUtils.isNotBlank(healthDoctor)){
                    setHealthDoctor(renew,healthDoctor);
                }
                //1.3.3.2设置新团队
                if(teamCode!=null&&teamCode!=0){
                    renew.setAdminTeamId(teamCode);
                }
                signFamilyDao.save(renew);
                //消息设为已读
                setMessState(mesId);

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/sign/DoctorFamilyContractController.java

@@ -515,7 +515,7 @@ public class DoctorFamilyContractController extends WeixinBaseController {
            int type,
            long adminTeamCode,
            @RequestParam(required = false, defaultValue = "0") String expenses,
            @RequestParam(required = true) String sevId) {
            @RequestParam(required = false) String sevId) {
        try {
            if (type != 2) {
                try {

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/sign/DoctorSignController.java

@@ -448,10 +448,10 @@ public class DoctorSignController extends WeixinBaseController {
                             @RequestParam(required = true)String patient,
                             @RequestParam(required = false) Long mesId,
                             @RequestParam(required = false)String signCode,
                             @RequestParam(required = true) String health,
                             @RequestParam(required = true) String disease,
                             @RequestParam(required = true) String custom,
                             @RequestParam(required = true) String sevId,
                             @RequestParam(required = false) String health,
                             @RequestParam(required = false) String disease,
                             @RequestParam(required = false) String custom,
                             @RequestParam(required = false) String sevId,
                             @RequestParam(required = false) String healthDoctor,
                             @RequestParam(required = false) Long teamCode){
        try{

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/account/PatientController.java

@@ -501,10 +501,12 @@ public class PatientController extends WeixinBaseController {
        try {
            Map<String, String> teamDoctors = new HashMap<>();
            Map<String, String> familyDoctors = new HashMap<>();
            Map<String,String> signDoctors = new HashMap<>();
            String id = getUID();
            JSONObject json = new JSONObject();
            //查询家庭签约
            SignFamily jt = familyContractService.findByPatientYes(id);
            if (jt != null) {
                List<Doctor> doctors = doctorTeamService.findJiatingTeamDoctors(id);
                if (doctors != null) {
@@ -517,6 +519,11 @@ public class PatientController extends WeixinBaseController {
                }
                json.put("teamCode_"+2,jt.getTeamCode());
                json.put("signCode_"+2,jt.getCode());
                signDoctors.put(jt.getDoctor(), jt.getDoctorName());
                if(StringUtils.isNotBlank(jt.getDoctorHealth())&&StringUtils.isNotBlank(jt.getDoctorHealthName())){
                    signDoctors.put(jt.getDoctorHealth(), jt.getDoctorHealthName());
                }
            }
            // 查询三师医生
            SignFamily ss = familyContractService.findBySanshiPatientYes(id);
@@ -550,7 +557,8 @@ public class PatientController extends WeixinBaseController {
            json.put("msg", "获取签约状态成功！");
            json.put("data", sign);
            json.put("teamDoctors", teamDoctors.size() > 0 ? new JSONArray(teamDoctors.values()) : new JSONArray());
            json.put("familyDoctors", familyDoctors.size() > 0 ? new JSONArray(familyDoctors.values()) : new JSONArray());
            //json.put("familyDoctors", familyDoctors.size() > 0 ? new JSONArray(familyDoctors.values()) : new JSONArray());
            json.put("familyDoctors",signDoctors.size()>0? new JSONArray(signDoctors.values()) : new JSONArray());
            return json.toString();
        } catch (Exception e) {
            error(e);