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

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

@@ -30,7 +30,7 @@ public interface DoctorDao extends PagingAndSortingRepository<Doctor, Long>, Jpa
    @Query("select p from Doctor p where p.code = ?1")
    Doctor findByCode(String code);
    Doctor findByCodeAndDel(String code,String del);
    Doctor findByCodeAndDel(String code,Integer del);
    @Query("select d from Doctor d where d.del = 1")
    List<Doctor> findAllDoctors();

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

@@ -12,4 +12,7 @@ import java.util.List;
public interface PatientCertificateDao extends PagingAndSortingRepository<PatientCertificate, Long>, JpaSpecificationExecutor<PatientCertificate> {
    List<PatientCertificate> findByPatientAndSignYearAndDel(String patient,String signYear,String del);
    List<PatientCertificate> findByPatientAndSignYearAndDelAndSignDictCode(String patient,String signYear,String del,String signCode);
}

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

@@ -40,6 +40,7 @@ import com.yihu.wlyy.task.SignUploadTask;
import com.yihu.wlyy.util.*;
import com.yihu.wlyy.wechat.util.WeiXinAccessTokenUtils;
import com.yihu.wlyy.wechat.util.WeiXinOpenIdUtils;
import io.swagger.models.auth.In;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.NameValuePair;
@@ -175,7 +176,8 @@ public class FamilyContractService extends BaseService {
    private PatientCertificateDao patientCertificateDao;
    @Autowired
    private SignDictDao signDictDao;
    @Autowired
    private SignFamilyServerDao signFamilyServerDao;
    public SignFamily findSignFamilyByCode(String code) {
        return signFamilyDao.findByCode(code);
@@ -3992,8 +3994,8 @@ public class FamilyContractService extends BaseService {
        if (jtSignFamily != null) {
            //家庭签约只找全科医生
            Doctor doctor = doctorDao.findByCodeAndDel(jtSignFamily.getDoctor(),"1");
            Doctor doctorHealth = doctorDao.findByCodeAndDel(jtSignFamily.getDoctorHealth(),"1");
            Doctor doctor = doctorDao.findByCodeAndDel(jtSignFamily.getDoctor(),1);
            Doctor doctorHealth = doctorDao.findByCodeAndDel(jtSignFamily.getDoctorHealth(),1);
            if (doctor != null) {
                JSONObject jo = new JSONObject();
                jo.put("code", doctor.getCode());
@@ -4538,7 +4540,15 @@ public class FamilyContractService extends BaseService {
        }
    }
    public String  saveCertificate(String patient,String imgPath,String sevId){
    /**
     * 新增更新证明接口
     * @param patient
     * @param imgPath
     * @param sevId
     * @param imgId
     * @return
     */
    public String  saveCertificate(String patient,String imgPath,String sevId,String imgId){
        try{
            if (StringUtils.isNotBlank(sevId)) {
                String[] sevIds = sevId.split(",");
@@ -4563,9 +4573,19 @@ public class FamilyContractService extends BaseService {
                        patientCertificate.setCertificatePath(im);
                        patientCertificate.setDel("1");
                        patientCertificate.setCreateTime(new Date());
                        //设置签约年度
                        patientCertificate.setSignYear(DateUtil.getSignYear()+"");
                        patientCertificateDao.save(patientCertificate);
                    }
                }
                //删除修改图片
                if(StringUtils.isNotBlank(imgId)){
                    String[] ids = imgId.split(",");
                    for(int i =0;i<ids.length;i++){
                        Long id = Long.parseLong(ids[i]);
                        patientCertificateDao.delete(id);
                    }
                }
            }
        }catch (Exception e){
            logger.info(e.getMessage()+"___:"+e.toString());
@@ -4576,4 +4596,8 @@ public class FamilyContractService extends BaseService {
    public List<SignDict> getSignDict(){
        return signDictDao.findByYear(DateUtil.getSignYear()+"");
    }
    public List<SignFamilyServer> findPatientSignServerBySignCode(String signCode){
       return signFamilyServerDao.findBySignCode(signCode);
    }
}

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

@@ -2957,4 +2957,9 @@ public class SignWebService extends BaseService {
       List<PatientCertificate>  list =  patientCertificateDao.findByPatientAndSignYearAndDel(patient,DateUtil.getSignYear()+"","1");
       return list;
    }
    public List<PatientCertificate> findByPatientAndSignYearAndDelAndSignDictCode(String patient,String signCode){
        List<PatientCertificate>  list =  patientCertificateDao.findByPatientAndSignYearAndDelAndSignDictCode(patient,DateUtil.getSignYear()+"","1",signCode);
        return list;
    }
}

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

@@ -4,6 +4,7 @@ import com.yihu.wlyy.aop.ObserverRequired;
import com.yihu.wlyy.entity.patient.Patient;
import com.yihu.wlyy.service.app.account.DoctorInfoService;
import com.yihu.wlyy.service.app.account.PatientInfoService;
import com.yihu.wlyy.service.app.sign.FamilyContractService;
import com.yihu.wlyy.service.app.sign.SignWebService;
import com.yihu.wlyy.service.common.account.PatientService;
import com.yihu.wlyy.service.third.jw.JwSignService;
@@ -53,6 +54,8 @@ public class DoctorSignController extends WeixinBaseController {
    StringRedisTemplate redisTemplate;
    @Autowired
    private PatientService patientService;
    @Autowired
    private FamilyContractService familyContractService;
    @RequestMapping(value = "getPatientFamilyServer",method = RequestMethod.GET)
    @ResponseBody
@@ -846,4 +849,41 @@ public class DoctorSignController extends WeixinBaseController {
            return error(-1, "查询失败！");
        }
    }
    @RequestMapping(value = "/findPatientCertificateByType", method = {RequestMethod.GET})
    @ResponseBody
    @ApiOperation("获取居民服务类型凭证")
    public String findPatientCertificate(@ApiParam(name = "patient", value = "居民code") @RequestParam(required = true)String patient,
                                         @ApiParam(name = "type", value = "服务类型code") @RequestParam(required = true)String type) {
        try {
            return write(200, "查询成功", "data", signWebService.findByPatientAndSignYearAndDelAndSignDictCode(patient,type));
        } catch (Exception e) {
            error(e);
            return error(-1, "查询失败！");
        }
    }
    @RequestMapping("/getSignDict")
    @ApiOperation(value = "获取当前年度服务类型")
    @ResponseBody
    public String getSignDict() {
        try{
            return write(200, "操作成功！", "data", familyContractService.getSignDict());
        }catch (Exception e){
            error(e);
            return error(-1, "请求失败");
        }
    }
    @RequestMapping("/findPatientSignServerBySignCode")
    @ApiOperation(value = "获取患者申请的服务类型")
    @ResponseBody
    public String findPatientSignServerBySignCode(String signCode){
        try{
            return write(200, "操作成功！", "data", familyContractService.findPatientSignServerBySignCode(signCode));
        }catch (Exception e){
            error(e);
            return error(-1, "请求失败");
        }
    }
}

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

@@ -426,7 +426,8 @@ public class FamilyContractController extends WeixinBaseController {
                       @RequestParam(required = false)String patient,
                       @RequestParam(required = false)String countryCode,
                       @RequestParam(required = true)String medicareNumber,
                       @RequestParam(required = false)String sevId) {
                       @RequestParam(required = false)String sevId,
                       @RequestParam(required = false)String imgId) {
        try {
            if (StringUtils.isEmpty(doctor)) {
                return error(-1, "签约医生不能为空");
@@ -455,7 +456,7 @@ public class FamilyContractController extends WeixinBaseController {
                if (StringUtils.isNotEmpty(content)) {
                    content = CommonUtil.copyTempImage(content);
                    if (StringUtils.isNotEmpty(content)) {
                        familyContractService.saveCertificate(patient,content,sevId);
                        familyContractService.saveCertificate(patient,content,sevId,imgId);
                    }
                }
@@ -482,7 +483,8 @@ public class FamilyContractController extends WeixinBaseController {
                            @RequestParam(required = false) String reason,
                            @RequestParam(required = false) String countryCode,
                            @RequestParam(required = true) String medicareNumber,
                            @RequestParam(required = false)String sevId) {
                            @RequestParam(required = false)String sevId,
                            @RequestParam(required = false)String imgId) {
        try {
            if (StringUtils.isEmpty(doctor)) {
                return error(-1, "签约医生不能为空");
@@ -518,7 +520,7 @@ public class FamilyContractController extends WeixinBaseController {
                if (StringUtils.isNotEmpty(content)) {
                    content = CommonUtil.copyTempImage(content);
                    if (StringUtils.isNotEmpty(content)) {
                        familyContractService.saveCertificate(patient,content,sevId);
                        familyContractService.saveCertificate(patient,content,sevId,imgId);
                    }
                }
                return write(200, "签约申请成功");
@@ -765,4 +767,17 @@ public class FamilyContractController extends WeixinBaseController {
        }
    }
    @RequestMapping(value = "/findPatientCertificateByType", method = {RequestMethod.GET})
    @ResponseBody
    @ApiOperation("获取居民服务类型凭证")
    public String findPatientCertificate(@ApiParam(name = "patient", value = "居民code") @RequestParam(required = true)String patient,
                                         @ApiParam(name = "type", value = "服务类型code") @RequestParam(required = true)String type) {
        try {
            return write(200, "查询成功", "data", signWebService.findByPatientAndSignYearAndDelAndSignDictCode(patient,type));
        } catch (Exception e) {
            error(e);
            return error(-1, "查询失败！");
        }
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/wechat/process/WeiXinEventProcess.java

@@ -922,8 +922,8 @@ public class WeiXinEventProcess {
            Map<String, String> articleConsult = new HashMap<>();
            articleConsult.put("Url", d.getActivityPath());
            articleConsult.put("Title", "家庭医生线上签约指引");
            articleConsult.put("Description", "贴心家庭医生为居民提供健康指导、随访等服务\n");
            articleConsult.put("Title", "家庭医生签约，红包来助力");
            articleConsult.put("Description", "数量有限，先到先得");
            articleConsult.put("PicUrl", activityPath);
            articles.add(articleConsult);
        }