官网接口修改

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@@ -12659,4 +12659,5 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            return "";
        }
    }
}

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/XzyyPrescriptionService.java

@@ -6,10 +6,12 @@ import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.ca.OauthCaConfigDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.entity.hospital.httplog.WlyyHttpLogDO;
import com.yihu.jw.entity.hospital.mapping.DoctorMappingDO;
import com.yihu.jw.entity.hospital.mapping.PatientMappingDO;
import com.yihu.jw.entity.hospital.prescription.*;
import com.yihu.jw.hospital.dict.WlyyHospitalSysDictDao;
import com.yihu.jw.hospital.httplog.dao.WlyyHttpLogDao;
import com.yihu.jw.hospital.mapping.dao.DoctorMappingDao;
import com.yihu.jw.hospital.mapping.dao.PatientMappingDao;
@@ -72,6 +74,8 @@ public class XzyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
    private BaseDoctorDao doctorDao;
    @Autowired
    private PrescriptionEmrDao prescriptionEmrDao;
    @Autowired
    private WlyyHospitalSysDictDao wlyyHospitalSysDictDao;
    /**
@@ -543,4 +547,22 @@ public class XzyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
        }
        return null;
    }
    public BaseDoctorDO checkDoctorNeedSign(String doctorId){
        BaseDoctorDO baseDoctorDO =baseDoctorDao.findById(doctorId);
        if (baseDoctorDO!=null){
            int defaultMinute=360;
            WlyyHospitalSysDictDO wlyyHospitalSysDictDO=wlyyHospitalSysDictDao.findById("singTimeControl");
            if (wlyyHospitalSysDictDO!=null){
                defaultMinute=Integer.parseInt(wlyyHospitalSysDictDO.getDictValue());
            }
            long nowTime = new Date().getTime();
            long lastSignTime = baseDoctorDO.getLastSignTime()==null?new Date().getTime():baseDoctorDO.getLastSignTime().getTime();
            if ((nowTime-lastSignTime)>defaultMinute*60*1000){
                baseDoctorDO.setIsSign("0");
            }
            baseDoctorDO = baseDoctorDao.save(baseDoctorDO);
        }
        return baseDoctorDO;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/article/KnowledgeArticleUserDO.java

@@ -30,7 +30,7 @@ public class KnowledgeArticleUserDO extends UuidIdentityEntityWithOperator {
	@Transient
	KnowledgeArticleDictDO knowledgeArticleDO;
	KnowledgeArticleDO knowledgeArticleDO;
	@Column(name = "user_code")
	public String getUser() {
@@ -123,11 +123,11 @@ public class KnowledgeArticleUserDO extends UuidIdentityEntityWithOperator {
	}
	@Transient
	public KnowledgeArticleDictDO getKnowledgeArticleDO() {
	public KnowledgeArticleDO getKnowledgeArticleDO() {
		return knowledgeArticleDO;
	}
	public void setKnowledgeArticleDO(KnowledgeArticleDictDO knowledgeArticleDO) {
	public void setKnowledgeArticleDO(KnowledgeArticleDO knowledgeArticleDO) {
		this.knowledgeArticleDO = knowledgeArticleDO;
	}
}

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/WlyyOutpatientDO.java

@@ -287,6 +287,18 @@ public class WlyyOutpatientDO extends UuidIdentityEntity {
     * 上次提醒时间
     */
    private Date lastRemindTime;
    /**
     * 是否同意查看就诊记录1已同意0未同意
     */
    private String isAgree;
    @Column(name = "is_agree")
    public String getIsAgree() {
        return isAgree;
    }
    public void setIsAgree(String isAgree) {
        this.isAgree = isAgree;
    }
    @Column(name = "last_remind_time")
    public Date getLastRemindTime() {
        return lastRemindTime;

server/svr-authentication/src/main/java/com/yihu/jw/security/oauth2/provider/endpoint/WlyyLoginEndpoint.java

@@ -292,24 +292,6 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
        baseLoginLogDO.setUserAgent(userAgent);
        baseLoginLogDO.setLoginType(loginType);
        baseLoginLogService.save(baseLoginLogDO);
        if ("2".equalsIgnoreCase(loginType)){
            if ("xm_xzzx_wx".equalsIgnoreCase(wechatId)){
                BaseDoctorDO baseDoctorDO =doctorDao.findById(wlyyUserSimple.getId());
                if (baseDoctorDO!=null){
                    int defaultMinute=360;
                    WlyyHospitalSysDictDO wlyyHospitalSysDictDO=wlyyhospitalSysdictDao.findDictById("singTimeControl");
                    if (wlyyHospitalSysDictDO!=null){
                        defaultMinute=Integer.parseInt(wlyyHospitalSysDictDO.getDictValue());
                    }
                    long nowTime = new Date().getTime();
                    long lastSignTime = baseDoctorDO.getLastSignTime()==null?new Date().getTime():baseDoctorDO.getLastSignTime().getTime();
                    if ((nowTime-lastSignTime)>defaultMinute*60*1000){
                        baseDoctorDO.setIsSign("0");
                    }
                    doctorDao.save(baseDoctorDO);
                }
            }
        }
        return getResponse(wlyyUserSimple);
    }
@@ -1395,16 +1377,6 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
        if (org.apache.commons.lang.StringUtils.isNotBlank(username)){
            BaseDoctorDO doctorDO = doctorDao.findByIdcard(username);
            int defaultMinute=360;
            WlyyHospitalSysDictDO wlyyHospitalSysDictDO=wlyyhospitalSysdictDao.findDictById("singTimeControl");
            if (wlyyHospitalSysDictDO!=null){
                defaultMinute=Integer.parseInt(wlyyHospitalSysDictDO.getDictValue());
            }
            long nowTime = new Date().getTime();
            long lastSignTime = doctorDO.getLastSignTime()==null?new Date().getTime():doctorDO.getLastSignTime().getTime();
            if ((nowTime-lastSignTime)>defaultMinute*60*1000){
                doctorDO.setIsSign("0");
            }
            doctorDO.setOpenid(openId);
            doctorDO.setCaFlag(1);
            doctorDao.save(doctorDO);

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/article/ArticleEndpoint.java

@@ -334,54 +334,6 @@ public class ArticleEndpoint extends EnvelopRestEndpoint {
		}
}
	@GetMapping(value = BaseHospitalRequestMapping.KnowledgeArticle.searchArticleByStatus)
	@ApiOperation(value = "获取患者文章状态列表")
	public Envelop searchPatientArticleByStatus(
			@ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
			@RequestParam(value = "fields", required = false) String fields,
			@ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
			@RequestParam(value = "filters", required = false) String filters,
			@ApiParam(name = "sorts", value = "排序，规则参见说明文档")
			@RequestParam(value = "sorts", required = false) String sorts,
			@ApiParam(name = "page", value = "第几页，从1开始", required = true, defaultValue = "1")
			@RequestParam(value = "page", required = true,defaultValue = "1")Integer page,
			@ApiParam(name = "pageSize", value = "每页分页大小", required = true, defaultValue = "10")
			@RequestParam(value = "pageSize", required = true,defaultValue = "10")Integer pageSize)throws Exception{
		try {
			if(StringUtils.isBlank(filters)){
				filters=filters+"del=1";
			}else{
				filters=filters+";del=1";
			}
			List<KnowledgeArticleUserDO> list  = knowledgeArticleUserService.search(fields,filters,sorts,page,pageSize);
			for (KnowledgeArticleUserDO knowledgeArticleUserDO:list){
				Integer type = knowledgeArticleUserDO.getRelationType();
				if (type==1){
					KnowledgeArticleDictDO knowledgeArticleDO = knowledgeArticleService.selectById(knowledgeArticleUserDO.getRelationCode());
					if (knowledgeArticleDO!=null){
						List<BaseDoctorHospitalDO> doctorHospitalDOS = doctorHospitalDao.findByDoctorCode(knowledgeArticleDO.getCreateUser());
						if (doctorHospitalDOS!=null&&doctorHospitalDOS.size()!=0){
							knowledgeArticleDO.setDeptName(doctorHospitalDOS.get(0).getDeptName());
							knowledgeArticleDO.setHospitalName(doctorHospitalDOS.get(0).getOrgName());
						}
					}
					knowledgeArticleUserDO.setKnowledgeArticleDO(knowledgeArticleDO);
				}
			}
			List<KnowledgeArticleUserDO> totals  = knowledgeArticleUserService.search(fields,filters,sorts);
			JSONObject result = new JSONObject();
			result.put("total",totals.size());
			result.put("detailModelList",list);
			return success(result);
		}catch (Exception e){
			return failedException(e);
		}
	}
	@PostMapping(value = BaseHospitalRequestMapping.KnowledgeArticle.findArticleByCategoryAndName)
	@ApiOperation(value = "查询文章")
	public MixEnvelop findArticleByCategoryAndName(@ApiParam(name = "categoryFirst", value = "一级分类code")

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/Xzyy/XzyyController.java

@@ -237,4 +237,19 @@ public class XzyyController extends EnvelopRestEndpoint {
        return ObjEnvelop.getSuccess("ok", xzyyPrescriptionService.selfSignQuit(baseDoctorDO.getOpenid(),sysTag));
    }
    /**
     * 请求自动签名授权接口
     * @param doctorId
     * @return
     * @throws Exception
     */
    @GetMapping(value = "/checkIsNeedSign")
    @ApiOperation(value = "判断是否需要授权", notes = "判断是否需要授权")
    public ObjEnvelop checkIsNeedSign(
                                   @ApiParam(name = "doctorId", value = "医生id", required = false)
                                   @RequestParam(value = "doctorId",required = false)String doctorId)throws Exception{
        BaseDoctorDO baseDoctorDO = baseDoctorDao.findById(doctorId);
        return ObjEnvelop.getSuccess("ok", xzyyPrescriptionService.checkDoctorNeedSign(doctorId));
    }
}