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

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

@@ -42,8 +42,8 @@ public interface SignFamilyDao extends PagingAndSortingRepository<SignFamily, Lo
    SignFamily findByTeamCode(String TeamCode);
    @Query("select a from SignFamily a where a.teamCode = ?1 and a.type = 2 and a.status >= 0")
    List<SignFamily> findByTeamCodeIsValid(String teamCode);
    @Query("select a from SignFamily a where a.teamCode = ?1 and a.type = 2 and a.code=?2")
    List<SignFamily> findByTeamCodeIsValid(String teamCode,String code);
    @Query("select a from SignFamily a where a.doctor = ?1 and a.patient = ?2 and a.type = 2 and a.status >= 0")
    SignFamily findByDoctorPatient(String doctor, String patient);

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

@@ -49,6 +49,6 @@ public interface SignFamilyRenewDao extends PagingAndSortingRepository<SignFamil
    @Query("select a from SignFamilyRenew a where a.patient = ?1 and a.type = 2 and a.status = 0")
    SignFamilyRenew findSigningByPatient(String patient);
    @Query("select a from SignFamilyRenew a where a.teamCode = ?1 and a.type = 2 and a.status >= 0")
    List<SignFamilyRenew> findByTeamCodeIsValid(String teamCode);
    @Query("select a from SignFamilyRenew a where a.teamCode = ?1 and a.type = 2 and a.code = ?2")
    List<SignFamilyRenew> findByTeamCodeIsValid(String teamCode,String code);
}

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

@@ -468,8 +468,13 @@ public class SignWebService extends BaseService {
        return jsonArray;
    }
    public JSONObject getSignInfo(String teamCode){
        List<SignFamily> signFamilys = signFamilyDao.findByTeamCodeIsValid(teamCode);
    /**
     * 已过时,启用getSignInfoOrRenewInfo
     * @param teamCode
     * @return
     */
    public JSONObject getSignInfo(String teamCode,String code){
        List<SignFamily> signFamilys = signFamilyDao.findByTeamCodeIsValid(teamCode,code);
        SignFamily signFamily =null;
        if(signFamilys==null||signFamilys.size()==0){
            throw new RuntimeException("找不到签约关系！");
@@ -1266,18 +1271,19 @@ public class SignWebService extends BaseService {
        }
    }
    public JSONObject getSignInfoOrRenewInfo(String teamCode){
    public JSONObject getSignInfoOrRenewInfo(String teamCode,String code){
        //签约或续签参数
        String patientCode = null;
        Long adminTeamId = null;
        String doctorHealth = null;
        String doctor =null;
        List<SignFamilyRenew> renews = signFamilyRenewDao.findByTeamCodeIsValid(teamCode);
        //先查找续签表有没有记录
        List<SignFamilyRenew> renews = signFamilyRenewDao.findByTeamCodeIsValid(teamCode,code);
        if(renews==null||renews.size()==0){
            List<SignFamily> signFamilys = signFamilyDao.findByTeamCodeIsValid(teamCode);
            //再查找签约表记录
            List<SignFamily> signFamilys = signFamilyDao.findByTeamCodeIsValid(teamCode,code);
            if(signFamilys==null||signFamilys.size()==0){
                throw new RuntimeException("找不到签约关系！");
            }else{
@@ -1311,14 +1317,22 @@ public class SignWebService extends BaseService {
        //签约团队的健管师
        if(StringUtils.isNotBlank(doctorHealth)){
            Doctor health = doctorService.findDoctorByCode(doctorHealth);
            JSONObject healthObj = this.doctorParse(health);
            resultObject.put("doctorHealth",healthObj);
            if(health!=null){
                JSONObject healthObj = this.doctorParse(health);
                resultObject.put("doctorHealth",healthObj);
            }else{
                resultObject.put("doctorHealth","");
            }
        }
        //签约团队的全科医生
        if(StringUtils.isNotBlank(doctor)){
            Doctor qk = doctorService.findDoctorByCode(doctor);
            JSONObject qkObj = this.doctorParse(qk);
            resultObject.put("doctor",qkObj);
            if(qk!=null){
                JSONObject healthObj = this.doctorParse(qk);
                resultObject.put("doctor",healthObj);
            }else{
                resultObject.put("doctor","");
            }
        }
        Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("GMT+08:00"));
        int year = calendar.get(Calendar.YEAR);

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

@@ -516,6 +516,7 @@ public class PatientController extends WeixinBaseController {
                    }
                }
                json.put("teamCode_"+2,jt.getTeamCode());
                json.put("signCode_"+2,jt.getCode());
            }
            // 查询三师医生
            SignFamily ss = familyContractService.findBySanshiPatientYes(id);
@@ -530,6 +531,7 @@ public class PatientController extends WeixinBaseController {
                    }
                }
                json.put("teamCode_"+1,ss.getTeamCode());
                json.put("signCode_"+1,jt.getCode());
            }
            // 未签约
            int sign = 0;

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

@@ -252,9 +252,10 @@ public class PatientSignController extends BaseController {
		}
	}
	@RequestMapping("/sign_doctor_info")
	public String getSignDoctorInfo(@RequestParam(required = true,value = "team")String teamCode) {
	public String getSignDoctorInfo(@RequestParam(required = true,value = "team")String teamCode,
									@RequestParam(required = true)String code) {
		try {
			JSONObject resultObj = signWebService.getSignInfoOrRenewInfo(teamCode);
			JSONObject resultObj = signWebService.getSignInfoOrRenewInfo(teamCode,code);
			return write(200, "查询成功！", "data", resultObj);
		} catch (Exception ex) {
			error(ex);