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

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

@@ -299,6 +299,6 @@ public interface ConsultTeamDao extends PagingAndSortingRepository<ConsultTeam,
	List<ConsultTeam> findUnfinishedConsultPrescription(String code);
	//按时间、类型、咨询时间统计居民咨询数量
	@Query("SELECT COUNT(1) FROM ConsultTeam a WHERE a.patient = ?1 AND a.type = ?2 AND a.czrq >= ?3 AND a.status = 1 AND a.del = '1' ")
	int countRemainConsult(String patient, int type, Date consultTime);
	@Query("SELECT COUNT(1) FROM ConsultTeam a WHERE a.patient = ?1 AND a.type = ?2 AND a.czrq >= ?3 AND a.czrq <= ?4 AND a.status = 1 AND a.del = '1' ")
	int countRemainConsult(String patient, int type, Date begin,Date end);
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/consult/ConsultTeamService.java

@@ -2728,18 +2728,26 @@ public class ConsultTeamService extends ConsultService {
     * @return
     * @throws Exception
     */
    public int countRemainConsult(String patient) throws Exception{
        int count = 10;
    public JSONObject countRemainConsult(String patient) throws Exception{
        JSONObject json = new JSONObject();
        try {
            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            String versionTime = systemDictDao.findByDictNameAndCode("VERSION_TIME","1.4.2");
            int amount = consultTeamDao.countRemainConsult(patient,2,format.parse(versionTime));
            count -= amount;
            String consultTimes = systemDictDao.findByDictNameAndCode("CONSULT_TIMES","1.4.2");
            int count = Integer.valueOf(consultTimes);
            json.put("count",count);
            SignFamily signFamily = signFamilyDao.findByjiatingPatient(patient);
            if (signFamily == null){
                return json;
            }
            int amount = consultTeamDao.countRemainConsult(patient,2,signFamily.getBegin(),signFamily.getEnd());
            amount = count - amount;
            if (amount<0){
                amount = 0;
            }
            json.put("amount",amount);
        }catch (Exception e){
            e.printStackTrace();
            count = -1;
        }
        return count;
        return json;
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/consult/ConsultController.java

@@ -1229,11 +1229,13 @@ public class ConsultController extends WeixinBaseController {
    public String countRemainConsult(){
        try {
            String patient = getRepUID();
            int count = consultTeamService.countRemainConsult(patient);
            if (count>=0){
                return write(200, "查询成功！", "data", count);
            JSONObject result = consultTeamService.countRemainConsult(patient);
            if (result.has("count") && result.has("amount")){
                return write(200, "查询成功！", "data", result);
            }else if (result.has("count") && !result.has("amount")){
                return error(-1, "查询已签约记录失败！");
            }else {
                return error(-1, "已缴费用户无家庭咨询次数限制！");
                return error(-1, "查询失败！");
            }
        }catch (Exception e){
            error(e);