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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/interceptors/DoctorInterceptor.java

@@ -143,7 +143,16 @@ public class DoctorInterceptor extends BaseInterceptor {
                token = tokenDao.findByPatient(uid, platform);
                if (token != null) {
                    // 加入缓存
                    tempMap.put(uid, token);
                    if (platform == 2) {
                        //tempMap = SystemData.doctorTokens;
                        systemDataRedis.setDoctorToken(token);
                    } else if (platform == 4) {
                        //tempMap = SystemData.doctorPCTokens;
                        systemDataRedis.setDoctorPCToken(token);
                    }else if(platform ==5){
                        //tempMap = SystemData.doctorWXTokens;
                        systemDataRedis.setDoctorWXToken(token);
                    }
                }
            }
            //  2、医生端app，3、微信公众号wechat,4、医生端pc，或者 PC端取药系统  或者对外系统

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

@@ -179,6 +179,9 @@ public class FamilyContractService extends BaseService {
    @Autowired
    private SignFamilyServerDao signFamilyServerDao;
    @Value("${spring.profiles}")
    private String profiles;
    public SignFamily findSignFamilyByCode(String code) {
        return signFamilyDao.findByCode(code);
    }
@@ -4614,11 +4617,12 @@ public class FamilyContractService extends BaseService {
    }
    public String getSickArchiveFlag(String patient) throws Exception {
        Patient p = patientDao.findByCode(patient);
        String rs = jwArchivesService.getSickArchiveFlag(p.getIdcard());
        String rs = "1";
        logger.info("======getSickArchiveFlag.profiles:"+profiles);
        if("prod".equals(profiles)){
            Patient p = patientDao.findByCode(patient);
            rs = jwArchivesService.getSickArchiveFlag(p.getIdcard());
        }
        return rs;
    }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/third/jw/JwArchivesService.java

@@ -809,8 +809,7 @@ public class JwArchivesService {
    /**
     *  查询居民是否有建立健康档案接口
     */
    public String getSickArchiveFlag(String idcard)  throws Exception
    {
    public String getSickArchiveFlag(String idcard)  throws Exception {
        String re = "0";//0 未建档，非0为档案号
        String url = jwUrl + "/third/archives/getSickArchiveFlag";

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

@@ -25,6 +25,7 @@ import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.Page;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
@@ -62,6 +63,7 @@ public class FamilyContractController extends WeixinBaseController {
    private RSAUtils rsaUtils;
    @Autowired
    private CommonUtil CommonUtil;
    /**
     * 得到患者的签约的医生的信息
     *