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

@@ -16,6 +16,7 @@ import org.springframework.data.repository.PagingAndSortingRepository;
import com.yihu.wlyy.entity.consult.ConsultTeam;
import java.util.Date;
import java.util.List;
public interface ConsultTeamDao extends PagingAndSortingRepository<ConsultTeam, Long>, JpaSpecificationExecutor<ConsultTeam> {
@@ -296,4 +297,8 @@ public interface ConsultTeamDao extends PagingAndSortingRepository<ConsultTeam,
	
	@Query("select a from ConsultTeam a where a.patient = ?1 and a.del = '1' and a.status = 0 and a.type = 8")
	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);
}

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

@@ -22,6 +22,7 @@ import com.yihu.wlyy.entity.zydict.ZyIvPhysicDict;
import com.yihu.wlyy.repository.consult.ConsultTeamDao;
import com.yihu.wlyy.repository.consult.ConsultTeamDoctorDao;
import com.yihu.wlyy.repository.consult.ConsultTeamLogDao;
import com.yihu.wlyy.repository.dict.SystemDictDao;
import com.yihu.wlyy.repository.doctor.DoctorPatientDao;
import com.yihu.wlyy.repository.doctor.DoctorTeamDao;
import com.yihu.wlyy.repository.doctor.DoctorTeamMemberDao;
@@ -152,6 +153,8 @@ public class ConsultTeamService extends ConsultService {
    private PatientHealthIndexService healthIndexService;
    @Autowired
    private MessageService messageService;
    @Autowired
    private SystemDictDao systemDictDao;
    //健康问题 高血压
    private static final String gxy = "HP0093";
    //健康问题 糖尿病
@@ -2718,4 +2721,25 @@ public class ConsultTeamService extends ConsultService {
        return  re;
    }
    /**
     * 根据居民code获取剩余家庭咨询次数
     *
     * @param patient
     * @return
     * @throws Exception
     */
    public int countRemainConsult(String patient) throws Exception{
        int count = 10;
        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;
        }catch (Exception e){
            e.printStackTrace();
            count = -1;
        }
        return count;
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/template/DoctorGuidanceTempService.java

@@ -300,6 +300,7 @@ public class DoctorGuidanceTempService extends BaseService {
            for (int i = 0; i < list.size(); i++) {
                DoctorTeamGuidanceTemplate dgt = list.get(i);
                Map<String, Object> tem = new HashMap<>();
                tem.put("teamId", dgt.getTeamId());
                tem.put("code", dgt.getTeamTemplateCode());
                tem.put("owner", dgt.getCreater());
                tem.put("sendTimes", dgt.getUseTimes());

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

@@ -95,15 +95,19 @@ public class PatientController extends WeixinBaseController {
            SignFamily jiating = familyContractService.findByPatientByType(getRepUID(), 2);
            int prescription = 0;
            int sign = 0;
            String expensesStatus = "";
            if (sanshi != null && jiating != null) {
                expensesStatus = jiating.getExpensesStatus();
                sign = 3;
            } else if (jiating != null) {
                expensesStatus = jiating.getExpensesStatus();
                sign = 2;
                List<SignFamilyServer> list = signFamilyServerDao.findBySignCodeAndType(jiating.getCode());
                if(list!=null&&list.size()>0){
                    prescription = 1;
                }
            } else if (sanshi != null) {
                expensesStatus = sanshi.getExpensesStatus();
                sign = 1;
            }
            if (temp != null) {
@@ -146,6 +150,7 @@ public class PatientController extends WeixinBaseController {
                // 设置地址
                json.put("address", temp.getAddress());
                // 设置签约状态：0未签约，1三师，2家庭，3三师和家庭
                json.put("expensesStatus", expensesStatus);
                json.put("sign", sign);
                json.put("prescription", prescription);//是否可以续方咨询0不可以、1可以
                json.put("countryCode",temp.getSickVillage()==null?"":temp.getSickVillage());

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

@@ -1223,6 +1223,24 @@ public class ConsultController extends WeixinBaseController {
        }
    }
    @RequestMapping(value = "remainConsultTimes",method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation("获取剩余家庭咨询次数")
    public String countRemainConsult(){
        try {
            String patient = getRepUID();
            int count = consultTeamService.countRemainConsult(patient);
            if (count>=0){
                return write(200, "查询成功！", "data", count);
            }else {
                return error(-1, "已缴费用户无家庭咨询次数限制！");
            }
        }catch (Exception e){
            error(e);
            return error(-1, "查询失败！");
        }
    }
    /**
     * 解析contentType
     *   PlainText: 1,   // 信息