代码修改

svr/svr-internet-hospital/pom.xml

@@ -6,7 +6,7 @@
    <parent>
        <groupId>com.yihu.jw</groupId>
        <artifactId>wlyy-parent-pom</artifactId>
        <version>2.0.0</version>
        <version>2.4.0</version>
        <relativePath>../../wlyy-parent-pom/pom.xml</relativePath>
    </parent>
@@ -47,7 +47,7 @@
        </dependency>
        <dependency>
            <groupId>org.springframework.cloud</groupId>
            <artifactId>spring-cloud-starter-eureka</artifactId>
            <artifactId>spring-cloud-netflix-eureka-client</artifactId>
        </dependency>
        <!--注释掉就不会读取git的配置，只会读取yml中的配置-->
        <dependency>
@@ -115,12 +115,12 @@
        <dependency>
            <groupId>com.yihu</groupId>
            <artifactId>swagger-starter</artifactId>
            <version>2.0.0</version>
            <version>${version.yihu-common}</version>
        </dependency>
        <dependency>
            <groupId>com.yihu</groupId>
            <artifactId>mysql-starter</artifactId>
            <version>2.0.0</version>
            <version>${version.yihu-common}</version>
            <exclusions>
                <exclusion>
                    <groupId>org.apache.tomcat</groupId>
@@ -205,7 +205,7 @@
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>base-service</artifactId>
            <version>2.0.0</version>
            <version>${version.wlyy-common}</version>
            <exclusions>
                <exclusion>
                    <groupId>xalan</groupId>
@@ -234,7 +234,7 @@
        <dependency>
            <groupId>net.sf.json-lib</groupId>
            <artifactId>json-lib</artifactId>
            <version>2.4</version>
            <version>${version.json-lib}</version>
        </dependency>
@@ -242,19 +242,19 @@
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>im-service</artifactId>
            <version>2.0.0</version>
            <version>${version.wlyy-common}</version>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>sms-service</artifactId>
            <version>2.0.0</version>
            <version>${version.wlyy-common}</version>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>es-service</artifactId>
            <version>2.0.0</version>
            <version>${version.wlyy-common}</version>
        </dependency>
@@ -263,7 +263,7 @@
        <dependency>
            <groupId>com.oracle</groupId>
            <artifactId>ojdbc6</artifactId>
            <version>11.2.0.3</version>
            <version>${version.oracle}</version>
        </dependency>
    </dependencies>

svr/svr-internet-hospital/src/main/java/com/yihu/SvrInternetHospitalApplication.java

@@ -3,8 +3,7 @@ package com.yihu;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.support.SpringBootServletInitializer;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
/**

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/config/SpringSecurityAuditorAware.java

@@ -3,16 +3,13 @@ package com.yihu.jw.hospital.config;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.domain.AuditorAware;
import java.util.Optional;
@Configuration
public class SpringSecurityAuditorAware implements AuditorAware {
    @Override
    public Object getCurrentAuditor() {
//        return Optional.ofNullable(SecurityContextHolder.getContext())
//                .map(SecurityContext::getAuthentication)
//                .filter(Authentication::isAuthenticated)
//                .map(Authentication::getPrincipal);
////                .map(Authentication::getDetails);
        return "123";
    @Override
    public Optional getCurrentAuditor() {
        return Optional.empty();
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/dao/consult/ConsultPriceDao.java

@@ -2,11 +2,11 @@ package com.yihu.jw.hospital.dao.consult;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalConsultPriceDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
public interface ConsultPriceDao extends PagingAndSortingRepository<WlyyHospitalConsultPriceDO, String>, JpaSpecificationExecutor<WlyyHospitalConsultPriceDO>  {
public interface ConsultPriceDao extends JpaRepository<WlyyHospitalConsultPriceDO, String>, JpaSpecificationExecutor<WlyyHospitalConsultPriceDO>  {
    // 根据机构编码查询所有计费列表
    List<WlyyHospitalConsultPriceDO> findByHospital(String hospital);
@@ -14,6 +14,4 @@ public interface ConsultPriceDao extends PagingAndSortingRepository<WlyyHospital
    // 根据机构编码、服务科室、医生类型、服务对象，查询单条价格记录
    WlyyHospitalConsultPriceDO findByHospitalAndDeptAndDoctorJobAndServiceRange(String hospital, String dept, String doctorJob, String serviceRange);
    // 根据id 查询已有记录
    WlyyHospitalConsultPriceDO findById(String id);
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/dao/consult/KnowledgeArticleDao.java

@@ -3,7 +3,7 @@ package com.yihu.jw.hospital.dao.consult;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.repository.query.Param;
import java.util.List;
@@ -13,7 +13,7 @@ import java.util.List;
 * @author huangwenjie
 * @date 2019/9/10 14:07
 */
public interface KnowledgeArticleDao extends PagingAndSortingRepository<KnowledgeArticleDO, String>, JpaSpecificationExecutor<KnowledgeArticleDO> {
public interface KnowledgeArticleDao extends JpaRepository<KnowledgeArticleDO, String>, JpaSpecificationExecutor<KnowledgeArticleDO> {
	@Query("select a from KnowledgeArticleDO a where a.del=1 and (categoryFirst = ?1 or categorySecond=?1)")
	List<KnowledgeArticleDO> findByCategory(String category);

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/dao/consult/KnowledgeArticleDeptDao.java

@@ -2,7 +2,7 @@ package com.yihu.jw.hospital.dao.consult;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleDeptDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
@@ -11,7 +11,7 @@ import java.util.List;
 * @author huangwenjie
 * @date 2019/9/18 10:03
 */
public interface KnowledgeArticleDeptDao extends PagingAndSortingRepository<KnowledgeArticleDeptDO, String>, JpaSpecificationExecutor<KnowledgeArticleDeptDO> {
public interface KnowledgeArticleDeptDao extends JpaRepository<KnowledgeArticleDeptDO, String>, JpaSpecificationExecutor<KnowledgeArticleDeptDO> {
	
	List<KnowledgeArticleDeptDO> findByArticleId(String articleId);
	

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/dao/consult/KnowledgeArticleUserDao.java

@@ -4,14 +4,14 @@ import com.yihu.jw.entity.base.patient.BasePatientBusinessDO;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleUserDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
/**
 * 健康文章中间库DAO
 * @author
 * @date 2019/9/10 14:07
 */
public interface KnowledgeArticleUserDao extends PagingAndSortingRepository<KnowledgeArticleUserDO, String>, JpaSpecificationExecutor<KnowledgeArticleUserDO> {
public interface KnowledgeArticleUserDao extends JpaRepository<KnowledgeArticleUserDO, String>, JpaSpecificationExecutor<KnowledgeArticleUserDO> {
	@Query("select a from KnowledgeArticleUserDO a where a.del=1 and a.relationCode=?1 and a.user=?2")
	KnowledgeArticleUserDO findByrelationCodeAndUserAndDel(String relationCode,String user);
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/dao/consult/KnowledgeCategoryDao.java

@@ -4,14 +4,14 @@ import com.yihu.jw.entity.hospital.article.KnowledgeCategoryDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.repository.query.Param;
/**
 * 健康文章分类
 * @author huangwenjie
 */
public interface KnowledgeCategoryDao extends PagingAndSortingRepository<KnowledgeCategoryDO, String>, JpaSpecificationExecutor<KnowledgeCategoryDO> {
public interface KnowledgeCategoryDao extends JpaRepository<KnowledgeCategoryDO, String>, JpaSpecificationExecutor<KnowledgeCategoryDO> {
	@Query("update KnowledgeCategoryDO c set c.del = 0 where c.id = ?1")
	@Modifying
	void updateDel(String id);

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/dao/consult/ReservationSettingDao.java

@@ -2,12 +2,10 @@ package com.yihu.jw.hospital.dao.consult;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalReservationSettingDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
public interface ReservationSettingDao extends PagingAndSortingRepository<WlyyHospitalReservationSettingDO, String>, JpaSpecificationExecutor<WlyyHospitalReservationSettingDO>  {
public interface ReservationSettingDao extends JpaRepository<WlyyHospitalReservationSettingDO, String>, JpaSpecificationExecutor<WlyyHospitalReservationSettingDO>  {
    // 根据id 查询已有记录
    WlyyHospitalReservationSettingDO findById(String id);
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/dao/consult/SysDictDao.java

@@ -2,19 +2,18 @@ package com.yihu.jw.hospital.dao.consult;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
public interface SysDictDao extends PagingAndSortingRepository<WlyyHospitalSysDictDO, String>, JpaSpecificationExecutor<WlyyHospitalSysDictDO>  {
public interface SysDictDao extends JpaRepository<WlyyHospitalSysDictDO, String>, JpaSpecificationExecutor<WlyyHospitalSysDictDO>  {
    WlyyHospitalSysDictDO findByHospitalAndDictCode(String hospital, String dictCode);
    List<WlyyHospitalSysDictDO> findByHospitalAndDictName(String hospital, String dictName);
    WlyyHospitalSysDictDO findById(String id);
    List<WlyyHospitalSysDictDO> findByDictName(String dictName);
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/dao/consult/WlyyPatientExpressageAddrDao.java

@@ -2,7 +2,7 @@ package com.yihu.jw.hospital.dao.consult;
import com.yihu.jw.entity.hospital.prescription.WlyyPatientExpressageAddrDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
@@ -18,7 +18,7 @@ import java.util.List;
 * </pre>
 * @since 1.
 */
public interface WlyyPatientExpressageAddrDao extends PagingAndSortingRepository<WlyyPatientExpressageAddrDO, String>, JpaSpecificationExecutor<WlyyPatientExpressageAddrDO>  {
public interface WlyyPatientExpressageAddrDao extends JpaRepository<WlyyPatientExpressageAddrDO, String>, JpaSpecificationExecutor<WlyyPatientExpressageAddrDO>  {
    boolean existsByPatientAndIsDefault(String patient, Integer isDefault);

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/MultipleCode/MultipleCoderController.java

@@ -70,7 +70,7 @@ public class MultipleCoderController extends EnvelopRestEndpoint {
        try {
            WlyyHttpLogDO logDO = new WlyyHttpLogDO();
            MixEnvelop envelop = new MixEnvelop();
            BasePatientDO patientDO = basePatientDao.findById(patientId);
            BasePatientDO patientDO = basePatientDao.getOne(patientId);
            logDO.setCode("ehc.ehealthcard.queryInfo");
            logDO.setName("查询多码融合信息");

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

@@ -201,7 +201,7 @@ public class XzyyController extends EnvelopRestEndpoint {
                                           @RequestParam(value = "sysTag",required = false)String sysTag,
                                           @ApiParam(name = "doctorId", value = "医生id", required = false)
                                           @RequestParam(value = "doctorId",required = false)String doctorId)throws Exception{
        BaseDoctorDO baseDoctorDO = baseDoctorDao.findById(doctorId);
        BaseDoctorDO baseDoctorDO = baseDoctorDao.findByIdAndDel(doctorId);
        return ObjEnvelop.getSuccess("ok", xzyyPrescriptionService.selfSignRequest(baseDoctorDO.getOpenid(),sysTag));
    }
    /**
@@ -217,7 +217,7 @@ public class XzyyController extends EnvelopRestEndpoint {
                                      @RequestParam(value = "sysTag",required = false)String sysTag,
                                      @ApiParam(name = "doctorId", value = "医生id", required = false)
                                      @RequestParam(value = "doctorId",required = false)String doctorId)throws Exception{
        BaseDoctorDO baseDoctorDO = baseDoctorDao.findById(doctorId);
        BaseDoctorDO baseDoctorDO = baseDoctorDao.findByIdAndDel(doctorId);
        return ObjEnvelop.getSuccess("ok", xzyyPrescriptionService.selfSignGetResult(baseDoctorDO,sysTag));
    }
    /**
@@ -233,7 +233,7 @@ public class XzyyController extends EnvelopRestEndpoint {
                                      @RequestParam(value = "sysTag",required = false)String sysTag,
                                      @ApiParam(name = "doctorId", value = "医生id", required = false)
                                      @RequestParam(value = "doctorId",required = false)String doctorId)throws Exception{
        BaseDoctorDO baseDoctorDO = baseDoctorDao.findById(doctorId);
        BaseDoctorDO baseDoctorDO = baseDoctorDao.findByIdAndDel(doctorId);
        return ObjEnvelop.getSuccess("ok", xzyyPrescriptionService.selfSignQuit(baseDoctorDO.getOpenid(),sysTag));
    }
@@ -250,7 +250,6 @@ public class XzyyController extends EnvelopRestEndpoint {
                                   @RequestParam(value = "doctorId",required = false)String doctorId,
                                   @ApiParam(name = "sysTag", value = "系统类型", required = false)
                                   @RequestParam(value = "sysTag",required = false)String sysTag)throws Exception{
        BaseDoctorDO baseDoctorDO = baseDoctorDao.findById(doctorId);
        return ObjEnvelop.getSuccess("ok", xzyyPrescriptionService.checkDoctorNeedSign(doctorId,sysTag));
    }

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

@@ -26,7 +26,6 @@ import io.swagger.annotations.ApiParam;
import io.swagger.models.auth.In;
import org.apache.commons.collections.IteratorUtils;
import org.apache.commons.lang.StringUtils;
import org.jboss.netty.handler.codec.http.multipart.MixedAttribute;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/consult/DoctorConsultEndpoint.java

@@ -229,7 +229,7 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
										  @ApiParam(name = "source", value = "来源")
											  @RequestParam(value = "source", required = false) String source)throws Exception{
			ConsultTeamDo consult = new ConsultTeamDo();
			WlyyOutpatientDO outpatientDO = outpatientDao.findById(outpatientCode);
			WlyyOutpatientDO outpatientDO = outpatientDao.getOne(outpatientCode);
			if (null!=outpatientDO){
                if(!outpatientDO.getDoctor().equalsIgnoreCase(doctorCode)){
                    return failed("当前患者已选择其他医生进行咨询或复诊。");
@@ -429,7 +429,7 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
							  @ApiParam(name = "source", value = "来源")
								  @RequestParam(value = "source", required = false) String source)throws Exception{
		ConsultTeamDo consult = new ConsultTeamDo();
		WlyyOutpatientDO outpatientDO = outpatientDao.findById(outpatientCode);
		WlyyOutpatientDO outpatientDO = outpatientDao.getOne(outpatientCode);
		if (null!=outpatientDO){
		    if(!outpatientDO.getDoctor().equalsIgnoreCase(doctorCode)){
                return failed("当前患者已选择其他医生进行咨询或复诊。");
@@ -524,10 +524,10 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
		synchronized (patient_code.intern()){
			result = imService.generalAddExpertConsult(patient_code, general_doctor,special_doctor,when,symptoms,images,consult,source);
			
			BaseDoctorDO generalDoctor = baseDoctorDao.findById(general_doctor);
			BaseDoctorDO specialDoctor = baseDoctorDao.findById(special_doctor);
			BaseDoctorDO generalDoctor = baseDoctorDao.findByIdAndDel(general_doctor);
			BaseDoctorDO specialDoctor = baseDoctorDao.findByIdAndDel(special_doctor);
			// 查询患者信息
			BasePatientDO p = basePatientDao.findById(patient_code);
			BasePatientDO p = basePatientDao.getOne(patient_code);
			//发送系统消息
			SystemMessageDO systemMessageDO = new SystemMessageDO();
			systemMessageDO.setTitle("新增专家咨询");
@@ -560,20 +560,20 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
			@RequestParam(value = "doctorCode",required = false) String doctorCode
	) throws Exception {
		int resutl = imService.finish(consult,doctorCode,2);
		BaseDoctorDO baseDoctorDO = baseDoctorDao.findById(doctorCode);
		BaseDoctorDO baseDoctorDO = baseDoctorDao.findByIdAndDel(doctorCode);
		JSONObject msgObj = new JSONObject();
		msgObj.put("msg",baseDoctorDO.getName()+"结束了咨询");
		msgObj.put("consultcode",consult);
		String jsonStr = "";
		if ("xm_zsyy_wx".equalsIgnoreCase(wxId)){
			//结束时医生未开处方则发送模板消息结算
			ConsultDo cons = consultDao.findOne(consult);
			ConsultDo cons = consultDao.getOne(consult);
			if (StringUtils.isNoneBlank(cons.getRelationCode())){
				WlyyOutpatientDO outpatientDO = outpatientDao.findById(cons.getRelationCode());
				WlyyOutpatientDO outpatientDO = outpatientDao.getOne(cons.getRelationCode());
				List<WlyyPrescriptionDO> wlyyPrescriptionDOS = prescriptionDao.findByOutpatientId(outpatientDO.getId());
				if (wlyyPrescriptionDOS==null||wlyyPrescriptionDOS.size()==0){
					logger.info("发送诊查费支付模板消息start");
					BasePatientDO patientDO = basePatientDao.findById(outpatientDO.getPatient());
					BasePatientDO patientDO = basePatientDao.getOne(outpatientDO.getPatient());
					String userName = null;
					String idcard = null;
					if (patientDO != null) {
@@ -708,7 +708,7 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
		try {
			prescriptionService.pickVideoPrescripitonWaitingPeople(outpatientCode,doctor);
			WlyyOutpatientDO wlyyOutpatientDO = outpatientDao.findOne(outpatientCode);
			WlyyOutpatientDO wlyyOutpatientDO = outpatientDao.getOne(outpatientCode);
			if (StringUtils.isNoneBlank(wlyyOutpatientDO.getType())){
				if (wlyyOutpatientDO.getType().equalsIgnoreCase("2")&&wlyyOutpatientDO.getOutpatientType().equalsIgnoreCase("3")){
					prescriptionService.sendWxTemplateMsg(wxId, wlyyOutpatientDO.getId(),null, "17", "videoOrderRemind", "");
@@ -783,7 +783,7 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
				for(Map<String,Object> consult :data){
					//如果是协同门诊，多返回全科医生的详细信息
					if(12 == Integer.parseInt(consult.get("type").toString()) && StringUtils.isNoneBlank((String)consult.get("generalDoctor"))){
						BaseDoctorDO baseDoctorDO = baseDoctorDao.findById((String)consult.get("generalDoctor"));
						BaseDoctorDO baseDoctorDO = baseDoctorDao.getOne((String)consult.get("generalDoctor"));
						List<BaseDoctorHospitalDO> baseDoctorHospitalDOList = baseDoctorHospitalDao.findByDoctorCode((String)consult.get("generalDoctor"));
						if(baseDoctorDO!=null){
							consult.put("generalDoctorName", baseDoctorDO.getName());
@@ -839,7 +839,7 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
				for(Map<String,Object> consult :data){
					//如果是协同门诊，多返回全科医生的详细信息
					if(12 == Integer.parseInt(consult.get("type").toString()) && StringUtils.isNoneBlank((String)consult.get("generalDoctor"))){
						BaseDoctorDO baseDoctorDO = baseDoctorDao.findById((String)consult.get("generalDoctor"));
						BaseDoctorDO baseDoctorDO = baseDoctorDao.findByIdAndDel((String)consult.get("generalDoctor"));
						List<BaseDoctorHospitalDO> baseDoctorHospitalDOList = baseDoctorHospitalDao.findByDoctorCode((String)consult.get("generalDoctor"));
						if(baseDoctorDO!=null){
							consult.put("generalDoctorName", baseDoctorDO.getName());
@@ -1160,7 +1160,7 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
					//如果是协同门诊，多返回全科医生的详细信息
					if(13 == Integer.parseInt((String)consult.get("type")) && StringUtils.isNoneBlank((String)consult.get("generalDoctor"))){
						BaseDoctorDO baseDoctorDO = baseDoctorDao.findById((String)consult.get("generalDoctor"));
						BaseDoctorDO baseDoctorDO = baseDoctorDao.findByIdAndDel((String)consult.get("generalDoctor"));
						consult.put("generalDoctorName", baseDoctorDO.getName());
					}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/consult/PatientConsultEndpoint.java

@@ -551,7 +551,7 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
					data.put("msg",msg);
					systemMessageDO.setData(data.toString());
					systemMessageService.saveMessage(systemMessageDO);
					BasePatientDO patientDO = basePatientDao.findById(patient);
					BasePatientDO patientDO = basePatientDao.getOne(patient);
					if ("xm_ykyy_wx".equalsIgnoreCase(wxId)){
						String templateMsgResult = ykyyService.pushNotificationToYktPatient(patientDO.getYktId(), systemMessageDO.getTitle(), data.get("msg").toString());
					}
@@ -576,8 +576,8 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
			data.put("type",1);
			systemMessageDO.setData(data.toString());
			hospitalSystemMessageService.saveMessage(systemMessageDO);
			BaseDoctorDO d = baseDoctorDao.findById(re.getString("doctor"));
			BasePatientDO p = basePatientDao.findById(re.getString("patient"));
			BaseDoctorDO d = baseDoctorDao.findByIdAndDel(re.getString("doctor"));
			BasePatientDO p = basePatientDao.getOne(re.getString("patient"));
			
			try {
				//眼科支付订单
@@ -604,7 +604,7 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
					if(d!=null&& org.apache.commons.lang3.StringUtils.isNoneBlank(d.getFee())){
						price = Double.parseDouble(d.getFee());
					}
					ConsultDo consultDo = consultDao.findOne(re.getString("consult"));
					ConsultDo consultDo = consultDao.getOne(re.getString("consult"));
					if (price==0.0){
						consultDo.setPayStatus(1);
						consultDao.save(consultDo);
@@ -615,7 +615,7 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
					if(d!=null&& org.apache.commons.lang3.StringUtils.isNoneBlank(d.getFee())){
						price = Double.parseDouble(d.getFee());
					}
					ConsultDo consultDo = consultDao.findOne(re.getString("consult"));
					ConsultDo consultDo = consultDao.getOne(re.getString("consult"));
					if (price==0.0){
						consultDo.setPayStatus(1);
						consultDao.save(consultDo);
@@ -705,13 +705,13 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
		String jsonStr = "";
		if ("xm_zsyy_wx".equalsIgnoreCase(wxId)){
		//结束时医生未开处方则发送模板消息结算
		ConsultDo cons = consultDao.findOne(consult);
		ConsultDo cons = consultDao.getOne(consult);
		if (org.apache.commons.lang3.StringUtils.isNoneBlank(cons.getRelationCode())){
			WlyyOutpatientDO outpatientDO = outpatientDao.findById(cons.getRelationCode());
			WlyyOutpatientDO outpatientDO = outpatientDao.getOne(cons.getRelationCode());
			List<WlyyPrescriptionDO> wlyyPrescriptionDOS = prescriptionDao.findByOutpatientId(outpatientDO.getId());
			if (wlyyPrescriptionDOS==null||wlyyPrescriptionDOS.size()==0){
				logger.info("发送诊查费支付模板消息start");
				BasePatientDO patientDO = basePatientDao.findById(outpatientDO.getPatient());
				BasePatientDO patientDO = basePatientDao.getOne(outpatientDO.getPatient());
				String userName = null;
				String idcard = null;
				if (patientDO != null) {
@@ -843,7 +843,7 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
			logger.info("pageUrl="+pageUrl);
			logger.info("wxId="+wxId);
			String ticket = wechatInfoService.getJsapi_ticketByToken(wxId);
			WxWechatDO wxWechatDO = wechatDao.findById(wxId);
			WxWechatDO wxWechatDO = wechatDao.findByIdAndStatus(wxId);
			Map<Object, Object> map = new HashMap<Object, Object>();
			if (ticket != null) {
				String noncestr = UUID.randomUUID().toString();

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

@@ -189,7 +189,7 @@ public class WlyyFamilyMemberController extends EnvelopRestEndpoint {
            throw new IllegalAccessException("SMS request frequency is too fast");
            //发送短信获取验证码
        }
        WlyyHospitalSysDictDO wlyyHospitalSysDictDO = wlyyHospitalSysDictDao.findById("isNeedSMS");
        WlyyHospitalSysDictDO wlyyHospitalSysDictDO = wlyyHospitalSysDictDao.getOne("isNeedSMS");
        if (wlyyHospitalSysDictDO!=null&&!StringUtils.isEmpty(wlyyHospitalSysDictDO.getDictValue())){
            String captcha = wlyyHospitalSysDictDO.getDictValue();
            this.store(client_id, phoneNum, captcha, 120);
@@ -296,7 +296,7 @@ public class WlyyFamilyMemberController extends EnvelopRestEndpoint {
            throw new IllegalAccessException("SMS request frequency is too fast");
            //发送短信获取验证码
        }
        WlyyHospitalSysDictDO wlyyHospitalSysDictDO = wlyyHospitalSysDictDao.findById("isNeedSMS");
        WlyyHospitalSysDictDO wlyyHospitalSysDictDO = wlyyHospitalSysDictDao.getOne("isNeedSMS");
        if (wlyyHospitalSysDictDO!=null&&!StringUtils.isEmpty(wlyyHospitalSysDictDO.getDictValue())){
            String captcha = wlyyHospitalSysDictDO.getDictValue();
            this.store(client_id, phoneNum, captcha, 120);
@@ -347,7 +347,7 @@ public class WlyyFamilyMemberController extends EnvelopRestEndpoint {
    //验证验证码
    public boolean verification(String client_id, String username, String code) {
        WlyyHospitalSysDictDO wlyyHospitalSysDictDO = wlyyHospitalSysDictDao.findById("isNeedSMS");
        WlyyHospitalSysDictDO wlyyHospitalSysDictDO = wlyyHospitalSysDictDao.getOne("isNeedSMS");
        if (wlyyHospitalSysDictDO!=null&&!StringUtils.isEmpty(wlyyHospitalSysDictDO.getDictValue())){
            if (code.equalsIgnoreCase(wlyyHospitalSysDictDO.getDictValue())){
                return true;

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/patient/PatientNoLoginEndPoint.java

@@ -644,7 +644,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
            BusinessOrderDO businessOrderDO = businessOrderDao.selectByOrderNo(seqNo);
            if (businessOrderDO.getStatus()!=1&&businessOrderDO.getStatus()!=9){
                if (businessOrderDO!=null&&businessOrderDO.getOrderCategory().equalsIgnoreCase("4")){
                    WlyyPrescriptionDO wlyyPrescriptionDO = prescriptionDao.findOne(businessOrderDO.getRelationCode());
                    WlyyPrescriptionDO wlyyPrescriptionDO = prescriptionDao.getOne(businessOrderDO.getRelationCode());
                    JSONObject object = (JSONObject) JSONObject.toJSON(wlyyPrescriptionDO);
                    logger.info("wlyyPrescriptionDO参数入参"+object.toJSONString());
                    WlyyPrescriptionVO prescriptionVO = JSONObject.toJavaObject(object,WlyyPrescriptionVO.class);
@@ -680,7 +680,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
    @RequestMapping(value = "/ylzReceiveNotify")
    public String mmpReceiveNotify(HttpServletRequest request, HttpServletResponse response) throws IOException, PayException {
        response.setContentType("text/html;charset=utf-8");
        OauthYlzConfigDO oauthYlzConfigDO = oauthYlzConfigDao.findById("ylz_pay_config");
        OauthYlzConfigDO oauthYlzConfigDO = oauthYlzConfigDao.getOne("ylz_pay_config");
        if(oauthYlzConfigDO==null){
            return "未找到支付配置文件";
        }
@@ -717,7 +717,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
                    BusinessOrderDO businessOrderDO = businessOrderDao.selectByOrderNo(traceNo);
                    if (businessOrderDO.getStatus()!=1){
                        if (businessOrderDO!=null&&businessOrderDO.getOrderCategory().equalsIgnoreCase("4")){
                            WlyyPrescriptionDO wlyyPrescriptionDO = prescriptionDao.findOne(businessOrderDO.getRelationCode());
                            WlyyPrescriptionDO wlyyPrescriptionDO = prescriptionDao.getOne(businessOrderDO.getRelationCode());
                            JSONObject object = (JSONObject) JSONObject.toJSON(wlyyPrescriptionDO);
                            logger.info("wlyyPrescriptionDO参数入参"+object.toJSONString());
                            WlyyPrescriptionVO prescriptionVO = JSONObject.toJavaObject(object,WlyyPrescriptionVO.class);
@@ -747,7 +747,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
                            //发送IM消息
                            hospitalSystemMessageService.sendImMessage(systemMessageDO);
                        }else if (businessOrderDO!=null&&businessOrderDO.getOrderCategory().equalsIgnoreCase("6")){
                            YlzMedicalRelationDO ylzMedicalRelationDO = ylzMedicailRelationDao.findOne(businessOrderDO.getRelationCode());
                            YlzMedicalRelationDO ylzMedicalRelationDO = ylzMedicailRelationDao.getOne(businessOrderDO.getRelationCode());
                            prescriptionService.confirmSettlementService(ylzMedicalRelationDO.getRelationCode());
                        }
                    }
@@ -767,7 +767,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
    @ApiOperation("支付回调")
    public String receiveNotify(HttpServletRequest request, HttpServletResponse response) throws IOException, IOException {
        response.setContentType("text/html;charset=utf-8");
        OauthYlzConfigDO oauthYlzConfigDO = oauthYlzConfigDao.findById("ylz_pay_config");
        OauthYlzConfigDO oauthYlzConfigDO = oauthYlzConfigDao.getOne("ylz_pay_config");
        if(oauthYlzConfigDO==null){
            return "未找到支付配置文件";
        }
@@ -832,7 +832,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
                        BusinessOrderDO businessOrderDO = businessOrderDao.selectByOrderNo(outChargeNo);
                        if (businessOrderDO.getStatus()!=1){
                            if (businessOrderDO!=null&&businessOrderDO.getOrderCategory().equalsIgnoreCase("4")){
                                WlyyPrescriptionDO wlyyPrescriptionDO = prescriptionDao.findOne(businessOrderDO.getRelationCode());
                                WlyyPrescriptionDO wlyyPrescriptionDO = prescriptionDao.getOne(businessOrderDO.getRelationCode());
                                JSONObject object = (JSONObject) JSONObject.toJSON(wlyyPrescriptionDO);
                                logger.info("wlyyPrescriptionDO参数入参"+object.toJSONString());
                                WlyyPrescriptionVO prescriptionVO = JSONObject.toJavaObject(object,WlyyPrescriptionVO.class);
@@ -969,7 +969,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
        logger.info("pageUrl="+pageUrl);
        logger.info("wxId="+wxId);
        String ticket = wechatInfoService.getJsapi_ticketByToken(wxId);
        WxWechatDO wxWechatDO = wechatDao.findById(wxId);
        WxWechatDO wxWechatDO = wechatDao.findByIdAndStatus(wxId);
        Map<Object, Object> map = new HashMap<Object, Object>();
        if (ticket != null) {
            String noncestr = UUID.randomUUID().toString();
@@ -1002,7 +1002,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
        if (wxId.equalsIgnoreCase("xm_zsyy_wx")){
            id = "zsyy";
        }
        WxEnterpriseDO wxEnterpriseDO = wxEnterpriseDao.findOne(id);
        WxEnterpriseDO wxEnterpriseDO = wxEnterpriseDao.getOne(id);
        Map<Object, Object> map = new HashMap<Object, Object>();
        if (ticket != null) {
            String noncestr = UUID.randomUUID().toString();
@@ -1157,7 +1157,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
    @RequestMapping(value = "/ylzSettleRecord")
    public String ylzSettleRecord(HttpServletRequest request, HttpServletResponse response) throws Exception{
        response.setContentType("text/html;charset=utf-8");
        OauthYlzConfigDO oauthYlzConfigDO = oauthYlzConfigDao.findById("ylz_balance_config");
        OauthYlzConfigDO oauthYlzConfigDO = oauthYlzConfigDao.getOne("ylz_balance_config");
        if(oauthYlzConfigDO==null){
            return "未找到支付配置文件";
        }
@@ -1178,7 +1178,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
            logger.info("解密后：{}",JSON.toJSONString(decryptRes) );
            JSONObject jsonObject = JSONObject.parseObject(JSON.toJSONString(decryptRes));
            String hsName="核酸";
            WlyyHospitalSysDictDO wlyyHospitalSysDictDO = wlyyHospitalSysDictDao.findById("natItemName");
            WlyyHospitalSysDictDO wlyyHospitalSysDictDO = wlyyHospitalSysDictDao.getOne("natItemName");
            if (wlyyHospitalSysDictDO!=null){
                hsName=wlyyHospitalSysDictDO.getDictValue();
            }
@@ -1213,7 +1213,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
                                    if (prescriptionDO.getStatus()!=30&&prescriptionDO.getStatus()>=20){
                                        String fee=null;
                                        String title = null;
                                        WlyyOutpatientDO wlyyOutpatientDO = outpatientDao.findById(prescriptionDO.getOutpatientId());
                                        WlyyOutpatientDO wlyyOutpatientDO = outpatientDao.getOne(prescriptionDO.getOutpatientId());
                                        if (wlyyOutpatientDO.getHisStatus()==null){
                                            fee=(prescriptionDO.getDrugFee()+wlyyOutpatientDO.getFee())+"";
                                            if (wxId.equalsIgnoreCase("xm_zsyy_wx")){
@@ -1275,14 +1275,14 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
                                                String title="您在厦门大学附属中山医院有一笔交易已支付完成！";
                                                pushPayLog = payInfoNoticeService.pushPrescriptionPayAndHsjc(natAppointmentDO.getPatientId(),natAppointmentDO.getDoctorName(),waitPayDetailVO.getVoucherNo(),natAppointmentDO.getId()+"",fee,title,null,waitPayDetailVO.getRecipeNo());
                                            }
                                            BasePatientDO patientDO = patientDao.findById(natAppointmentDO.getPatientId());
                                            BasePatientDO patientDO = patientDao.getOne(natAppointmentDO.getPatientId());
                                            //发送预约成功通知
                                            String name= patientDO.getName();
                                            String idcard = patientDO.getIdcard();
                                            String mobile = patientDO.getMobile();
                                            String url = "https://hlwyy.xmzsh.com/hlwyy/ims-wx/#/nucleicTest/detail?id="+natAppointmentDO.getId();
                                            String date = DateUtil.dateToStrLong(natAppointmentDO.getAppointmentTime());
                                            WlyyHospitalSysDictDO hospitalSysDictDO = wlyyHospitalSysDictDao.findById("natConfigTestNew");
                                            WlyyHospitalSysDictDO hospitalSysDictDO = wlyyHospitalSysDictDao.getOne("natConfigTestNew");
                                            String addres = "我院五号楼北侧（急诊部后侧）";
                                            String timeDes = "6-8小时";
                                            if (hospitalSysDictDO!=null){
@@ -1418,7 +1418,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
                          @ApiParam(name = "demoflag", value = "是否测试")
                          @RequestParam(value = "demoflag", required = false) boolean demoflag) throws Exception{
        WlyyPrescriptionDO wlyyPrescriptionDO = prescriptionDao.findOne(prescriptionId);
        WlyyPrescriptionDO wlyyPrescriptionDO = prescriptionDao.getOne(prescriptionId);
        //判断是否是快递如果是则下物流单
        List<WlyyPrescriptionExpressageDO> expressList=prescriptionExpressageDao.findByOutpatientId(wlyyPrescriptionDO.getOutpatientId());
        if (null!=expressList&&expressList.size()>0){
@@ -1994,7 +1994,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
    @GetMapping("/smsToDoctor")
    public Envelop sentMessageRemindSms(@RequestParam(value = "consult", required = true)String consult){
        try {
            ConsultDo consultDo = consultDao.findOne(consult);
            ConsultDo consultDo = consultDao.getOne(consult);
            return  success(systemMessageService.sendDoctorRemindSms(consultDo));
        } catch (Exception e) {
            return failedException(e);
@@ -2141,14 +2141,14 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
            @ApiParam(name = "type", value = "追问内容类型：1文字，2图片，3语音  ... (im消息类型)")
            @RequestParam(value = "type",required = true) Integer type,
            @ApiParam(name = "times", value = "")
            @RequestParam(value = "times",required = false) Integer times) throws Exception {
            @RequestParam(value = "times",required = false) Integer times,HttpServletRequest request) throws Exception {
        JSONObject object = new JSONObject();
        UploadVO uploadVO = new UploadVO();
        //处理语音文件
        if(!org.springframework.util.StringUtils.isEmpty(wxId)){
            if(3 == type){//语音文件
                String voicepath = enterpriseService.fetchWxVoices(wxId);
                String voicepath = enterpriseService.fetchWxVoices(wxId,request);
                logger.info("voice_path:"+voicepath);
                JSONObject obj = new JSONObject();
                String voiceurl = "";
@@ -2189,7 +2189,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
                                 @RequestParam(value = "mailStatus", required = false)String mailStatus,
                             @ApiParam(name = "prescriptionId", value = "")
                                 @RequestParam(value = "prescriptionId", required = false)String prescriptionId) {
       WlyyOutpatientDO wlyyOutpatientDO =  outpatientDao.findById(outpatientId);
       WlyyOutpatientDO wlyyOutpatientDO =  outpatientDao.getOne(outpatientId);
        ConsultTeamDo consultTeamDo = consultTeamDao.queryByRelationCode(outpatientId);
        return success(prescriptionService.wxTempalteJPush(templateCode,wlyyOutpatientDO,consultTeamDo,drugName,mailNo,mailStatus,prescriptionId));
@@ -2590,7 +2590,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
                JSONObject orderStatus=JSONObject.parseObject(res);
                if ("0".equalsIgnoreCase(orderStatus.getString("code"))){
                    System.out.println("开始同步状态");
                        BaseNatAppointmentDO baseNatAppointmentDO = baseNatAppointmentDao.findOne(Integer.valueOf(businessOrderDO.getRelationCode()));
                        BaseNatAppointmentDO baseNatAppointmentDO = baseNatAppointmentDao.getOne(Integer.valueOf(businessOrderDO.getRelationCode()));
                        if (baseNatAppointmentDO!=null){
                            if (baseNatAppointmentDO.getPayStatus().equalsIgnoreCase("0")){
                                JSONObject chargeObj=new JSONObject();

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/prescription/PrescriptionEndpoint.java

@@ -589,7 +589,7 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
                objEnvelop.setStatus(300);
                return objEnvelop;
            } else {
                BaseDoctorDO doctorDO = baseDoctorDao.findById(wlyyOutpatientDO.getDoctor());
                BaseDoctorDO doctorDO = baseDoctorDao.findByIdAndDel(wlyyOutpatientDO.getDoctor());
                if (wlyyOutpatientDO.getPayStatus() != null && wlyyOutpatientDO.getPayStatus() == 1) {
                    //发送系统消息
                    SystemMessageDO systemMessageDO = prescriptionService.sendOutPatientMes(wlyyOutpatientDO, payFlag);
@@ -764,7 +764,7 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
            msgObj.put("zd", zd_str);
            msgObj.put("jl", jl_str);
            msgObj.put("outpatientid", outPatientId);
            WlyyOutpatientDO wlyyOutpatientDO = outpatientDao.findOne(outPatientId);
            WlyyOutpatientDO wlyyOutpatientDO = outpatientDao.getOne(outPatientId);
            String immsg = imService.pushHuiZhenMsg(msgObj, wlyyOutpatientDO.getDoctor(), wlyyOutpatientDO.getDoctorName(), outPatientId, wlyyOutpatientDO.getPatient(), wlyyOutpatientDO.getOutpatientType());
            System.out.println("发送诊断消息成功：" + immsg);
            if (result.get("prescriptionId") != null && StringUtils.isNoneBlank(orderId)) {
@@ -2410,7 +2410,7 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
        try {
            WlyyPrescriptionDO wlyyPrescriptionDO = prescriptionService.findPrescriptionDo(prescriptionId);
            WlyyOutpatientDO wlyyOutpatientDO = outpatientDao.findOne(wlyyPrescriptionDO.getOutpatientId());
            WlyyOutpatientDO wlyyOutpatientDO = outpatientDao.getOne(wlyyPrescriptionDO.getOutpatientId());
            if (status == 1) {
                com.alibaba.fastjson.JSONObject msgObj = new com.alibaba.fastjson.JSONObject();
                msgObj.put("outpatientid", wlyyPrescriptionDO.getOutpatientId());
@@ -3266,7 +3266,7 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
        } else if ("xm_tasy_wx".equalsIgnoreCase(wxId)) {
            String res = tasyNatService.departMent(deptCode);
            String dept = "";
            WlyyHospitalSysDictDO wlyyHospitalSysDictDO = wlyyHospitalSysDictDao.findById("tasyNatDept");
            WlyyHospitalSysDictDO wlyyHospitalSysDictDO = wlyyHospitalSysDictDao.getOne("tasyNatDept");
            if (wlyyHospitalSysDictDO != null) {
                dept = wlyyHospitalSysDictDO.getDictValue();
            }

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/MultipleCode/MultipleCodeService.java

@@ -56,8 +56,8 @@ public class MultipleCodeService {
    public MixEnvelop mcfRegister(BasePatientDO patientDO, String wechatId) throws Exception {
        BasePatientWechatDo patientWechatDo = basePatientWechatDao.findByWechatIdAndPatientId(wechatId, patientDO.getId()).get(0);
        WxWechatDO wechatDO = wechatDao.findById(wechatId);
        OauthYlzConfigDO oauthYlzConfigDO = oauthYlzConfigDao.findOne("mcf_config");
        WxWechatDO wechatDO = wechatDao.findByIdAndStatus(wechatId);
        OauthYlzConfigDO oauthYlzConfigDO = oauthYlzConfigDao.getOne("mcf_config");
        TransResponse re= new TransResponse();
        try {
            TransRequest request = new TransRequest();
@@ -101,11 +101,11 @@ public class MultipleCodeService {
//     根据openId、 accountId查询三码融合码信息
    public MixEnvelop mcfOpenquery(String patientId,String wechatId) throws Exception {
        WxWechatDO wechatDO = wechatDao.findByAppId(wechatId);
        BasePatientDO patientDO = basePatientDao.findById(patientId);
        BasePatientDO patientDO = basePatientDao.getOne(patientId);
        if (patientDO!=null){
            BasePatientWechatDo patientWechatDo = basePatientWechatDao.findByWechatIdAndPatientId(wechatId, patientDO.getId()).get(0);
            if (patientWechatDo!=null){
                OauthYlzConfigDO oauthYlzConfigDO = oauthYlzConfigDao.findOne("mcf_config");
                OauthYlzConfigDO oauthYlzConfigDO = oauthYlzConfigDao.getOne("mcf_config");
                TransRequest request = new TransRequest();
                request.setMethod("ehc.ehealthcard.openquery");
                request.setApp_id(oauthYlzConfigDO.getAppId());
@@ -178,7 +178,7 @@ public class MultipleCodeService {
    }
//     获取展码地址
    public  String mcfGetCodeUrl(String ehealth_card_id) throws Exception {
        OauthYlzConfigDO oauthYlzConfigDO = oauthYlzConfigDao.findById("mcf_config");
        OauthYlzConfigDO oauthYlzConfigDO = oauthYlzConfigDao.getOne("mcf_config");
        TransRequest request = new TransRequest();
        request.setMethod("ehc.ehealthcard.getCodeUrl");
        request.setApp_id(oauthYlzConfigDO.getAppId());
@@ -208,7 +208,7 @@ public class MultipleCodeService {
    }
    //通过身边证查询用户信息
    public  String  mcfQueryInfo(BasePatientDO patientDO) throws Exception {
        OauthYlzConfigDO oauthYlzConfigDO = oauthYlzConfigDao.findById("mcf_config");
        OauthYlzConfigDO oauthYlzConfigDO = oauthYlzConfigDao.getOne("mcf_config");
        TransRequest request = new TransRequest();
        request.setMethod("ehc.ehealthcard.queryInfo");
        request.setApp_id(oauthYlzConfigDO.getAppId());
@@ -302,7 +302,7 @@ public class MultipleCodeService {
    }
    public MixEnvelop mcfQueryInfo(String ehealth_card_id ) throws Exception {
        OauthYlzConfigDO oauthYlzConfigDO = oauthYlzConfigDao.findById("mcf_config");
        OauthYlzConfigDO oauthYlzConfigDO = oauthYlzConfigDao.getOne("mcf_config");
        TransRequest request = new TransRequest();
        request.setMethod("ehc.ehealthcard.queryInfo");
        request.setApp_id(oauthYlzConfigDO.getAppId());

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/SystemMessage/HospitalSystemMessageService.java

@@ -86,7 +86,7 @@ public class HospitalSystemMessageService  {
	 */
	@Async
	public void sendImPichCheckMessage(WlyyOutpatientDO wlyyOutpatientDO) throws Exception {
		BasePatientDO basePatientDO =basePatientDao.findById(wlyyOutpatientDO.getPatient());
		BasePatientDO basePatientDO =basePatientDao.getOne(wlyyOutpatientDO.getPatient());
		String tagMsg = "";
		JSONObject object = new JSONObject();
		object.put("socket_sms_type",12);//抢单事件

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/consult/BasePatientBusinessService.java

@@ -68,13 +68,13 @@ public class BasePatientBusinessService extends BaseJpaService<BasePatientBusine
			knowledgeArticleUserDO.setDel(1);
			knowledgeArticleUserDO.setUser(user);
			if (StringUtils.isNoneBlank(userType)&&userType.equalsIgnoreCase("1")){
				BasePatientDO patientDO = patientDao.findById(user);
				BasePatientDO patientDO = patientDao.getOne(user);
				if (patientDO!=null){
					knowledgeArticleUserDO.setUserName(patientDO.getName());
					knowledgeArticleUserDO.setCreateUserName(patientDO.getName());
				}
			}else if (StringUtils.isNoneBlank(userType)&&userType.equalsIgnoreCase("2")){
				BaseDoctorDO doctorDO = doctorDao.findById(user);
				BaseDoctorDO doctorDO = doctorDao.getOne(user);
				if (doctorDO!=null){
					knowledgeArticleUserDO.setUserName(doctorDO.getName());
					knowledgeArticleUserDO.setCreateUserName(doctorDO.getName());
@@ -170,8 +170,8 @@ public class BasePatientBusinessService extends BaseJpaService<BasePatientBusine
		return knowledgeArticleDO;
	}
	public void setUsed(String id,Integer used,String doctor){
		WlyySurveyTemplateDO wlyySurveyTemplateDO = surveyTemplateDao.findOne(id);
		BaseDoctorDO doctorDO = doctorDao.findById(doctor);
		WlyySurveyTemplateDO wlyySurveyTemplateDO = surveyTemplateDao.getOne(id);
		BaseDoctorDO doctorDO = doctorDao.getOne(doctor);
		KnowledgeArticleUserDO knowledgeArticleUserDO =knowledgeArticleUserDao.findByrelationCodeAndUserAndDel(id,doctor);
		if (null==knowledgeArticleUserDO){
			knowledgeArticleUserDO = new KnowledgeArticleUserDO();

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/consult/ConsultPriceService.java

@@ -51,7 +51,7 @@ public class ConsultPriceService extends BaseJpaService<WlyyHospitalConsultPrice
            wlyyHospitalConsultPriceDO.setHospital(hospital);
            wlyyHospitalConsultPriceDO = consultPriceDao.save(wlyyHospitalConsultPriceDO);
        }else{
            WlyyHospitalConsultPriceDO wlyyHospitalConsultPriceDOL = consultPriceDao.findById(id);
            WlyyHospitalConsultPriceDO wlyyHospitalConsultPriceDOL = consultPriceDao.getOne(id);
            wlyyHospitalConsultPriceDOL.setType(dataDetail.get("type") == "" ? 0 : Integer.parseInt(dataDetail.get("type").toString()));
            wlyyHospitalConsultPriceDOL.setPayType(dataDetail.get("payType") == "" ? 0 : Integer.parseInt(dataDetail.get("payType").toString()));
            wlyyHospitalConsultPriceDOL.setDept(dataDetail.get("dept") == "" ? "" : dataDetail.get("dept").toString());
@@ -67,7 +67,7 @@ public class ConsultPriceService extends BaseJpaService<WlyyHospitalConsultPrice
    public void deleteConsultPrice(String id){
        consultPriceDao.delete(id);
        consultPriceDao.deleteById(id);
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/consult/KnowledgeArticleService.java

@@ -92,7 +92,7 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDO,
	 * @throws Exception
	 */
	public KnowledgeArticleDO saveArticle(String jsonData) throws  Exception {
		WlyyHospitalSysDictDO wlyyHospitalSysDictDO = hospitalSysDictDao.findById("EXAMINE");
		WlyyHospitalSysDictDO wlyyHospitalSysDictDO = hospitalSysDictDao.getOne("EXAMINE");
		KnowledgeArticleDO knowledgeArticleDO = EntityUtils.jsonToEntity(jsonData, KnowledgeArticleDO.class);
		if (null == knowledgeArticleDO.getId()) {
			// 新增
@@ -106,7 +106,7 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDO,
			knowledgeArticleDO = knowledgeArticleDao.save(knowledgeArticleDO);
			return knowledgeArticleDO;
		} else {
			KnowledgeArticleDO one = knowledgeArticleDao.findOne(knowledgeArticleDO.getId());
			KnowledgeArticleDO one = knowledgeArticleDao.getOne(knowledgeArticleDO.getId());
			one.setTitle(knowledgeArticleDO.getTitle());
			one.setContent(knowledgeArticleDO.getContent());
			one.setImage(knowledgeArticleDO.getImage());
@@ -121,13 +121,12 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDO,
	/**
	 * 更新/保存健康文章
	 * @param jsonData
	 * @return
	 * @throws Exception
	 */
	public KnowledgeArticleDO updateIsShow(String id,Integer isShow) throws  Exception {
		KnowledgeArticleDO one = knowledgeArticleDao.findOne(id);
		KnowledgeArticleDO one = knowledgeArticleDao.getOne(id);
		one.setIsShow(isShow);
		one.setUpdateTime(new Date());
		knowledgeArticleDao.save(one);
@@ -138,7 +137,7 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDO,
	//审核/退回文章
	public KnowledgeArticleDO reviewArticle(String articleId,Integer status,String reason) throws Exception{
		
		KnowledgeArticleDO knowledgeArticleDO = knowledgeArticleDao.findOne(articleId);
		KnowledgeArticleDO knowledgeArticleDO = knowledgeArticleDao.getOne(articleId);
		if (null == knowledgeArticleDO) {
			throw new Exception("该文章不存在");
		} else {
@@ -164,13 +163,13 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDO,
		//删除之前关系
		List<KnowledgeArticleDeptDO> list = knowledgeArticleDeptDao.findByArticleId(articleId);
		if(list!=null&&list.size()>0){
			knowledgeArticleDeptDao.delete(list);
			knowledgeArticleDeptDao.deleteAll(list);
		}
		
		if(org.apache.commons.lang3.StringUtils.isNotBlank(sdJsons)){
			List<KnowledgeArticleDeptDO> _list = EntityUtils.jsonToList(sdJsons,KnowledgeArticleDeptDO.class);
			if(_list!=null&&_list.size()>0){
				knowledgeArticleDeptDao.save(_list);
				knowledgeArticleDeptDao.saveAll(_list);
			}
		}
		return true;
@@ -226,13 +225,13 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDO,
		//删除之前关系
		List<KnowledgeArticleDeptDO> dels = knowledgeArticleDeptDao.findByDept(dept);
		if(dels!=null&&dels.size()>0){
			knowledgeArticleDeptDao.delete(dels);
			knowledgeArticleDeptDao.deleteAll(dels);
		}
		
		if(org.apache.commons.lang3.StringUtils.isNotBlank(sdJsons)){
			List<KnowledgeArticleDeptDO> list = EntityUtils.jsonToList(sdJsons,KnowledgeArticleDeptDO.class);
			if(list!=null&&list.size()>0){
				knowledgeArticleDeptDao.save(list);
				knowledgeArticleDeptDao.saveAll(list);
			}
		}
		return true;
@@ -272,7 +271,7 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDO,
				}else {
					WlyySurveyUserDO wlyySurveyUserDO = new WlyySurveyUserDO();
					String doctor = patientBusinessDO.getDoctor();
					BaseDoctorDO doctorDO = doctorDao.findById(doctor);
					BaseDoctorDO doctorDO = doctorDao.getOne(doctor);
					wlyySurveyUserDO.setDept(doctorDO.getVisitDept());
					wlyySurveyUserDO.setDeptName(doctorDO.getVisitDeptName());
					wlyySurveyUserDO.setDoctor(doctor);
@@ -286,7 +285,7 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDO,
					wlyySurveyUserDO.setEndTime(new Date());
					wlyySurveyUserDO = surveyUserDao.save(wlyySurveyUserDO);
					JSONObject object = new JSONObject();
					WlyySurveyTemplateDO wlyySurveyTemplateDO = surveyTemplateDao.findOne(wlyySurveyUserDO.getSurveyTempCode());
					WlyySurveyTemplateDO wlyySurveyTemplateDO = surveyTemplateDao.getOne(wlyySurveyUserDO.getSurveyTempCode());
					if (null!=wlyySurveyTemplateDO){
						object.put("title",wlyySurveyTemplateDO.getTitle());
						object.put("content",wlyySurveyTemplateDO.getTemplateComment());
@@ -309,7 +308,7 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDO,
	 */
	public KnowledgeArticleDO setUsed(String id,Integer used,String doctor){
		KnowledgeArticleDO knowledgeArticleDO = knowledgeArticleDao.findByIdAndDel(id);
		BaseDoctorDO doctorDO = doctorDao.findById(doctor);
		BaseDoctorDO doctorDO = doctorDao.getOne(doctor);
		KnowledgeArticleUserDO knowledgeArticleUserDO =knowledgeArticleUserDao.findByrelationCodeAndUserAndDel(id,doctor);
		if (knowledgeArticleUserDO==null){
			knowledgeArticleUserDO = new KnowledgeArticleUserDO();

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/consult/KnowledgeCategoryService.java

@@ -45,7 +45,7 @@ public class KnowledgeCategoryService extends BaseJpaService<KnowledgeCategoryDO
			knowledgeCategoryDO.setCreateTime(new Date());
			knowledgeCategoryDO.setDel(1);
		} else {
			KnowledgeCategoryDO one = knowledgeCategoryDao.findOne(knowledgeCategoryDO.getId());
			KnowledgeCategoryDO one = knowledgeCategoryDao.getOne(knowledgeCategoryDO.getId());
			knowledgeCategoryDO.setId(one.getId());
			knowledgeCategoryDO.setDel(one.getDel());
			knowledgeCategoryDO.setUpdateTime(new Date());

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/consult/QrcodeService.java

@@ -148,7 +148,7 @@ public class QrcodeService {
        }
        System.out.println("token"+token);
        System.out.println("wxId"+wxId);
        BaseDoctorDO baseDoctorDO = baseDoctorDao.findById(doctor);
        BaseDoctorDO baseDoctorDO = baseDoctorDao.findByIdAndDel(doctor);
        if (null!=baseDoctorDO){
            if (null==baseDoctorDO.getQrcode()||"".equals(baseDoctorDO.getQrcode())){
                // 二维码内容
@@ -186,7 +186,7 @@ public class QrcodeService {
        System.out.println("token"+token);
        System.out.println("wxId"+wxId);
        if (StringUtils.isNoneBlank(doctor)){
            BaseDoctorDO baseDoctorDO = baseDoctorDao.findById(doctor);
            BaseDoctorDO baseDoctorDO = baseDoctorDao.findByIdAndDel(doctor);
            if (null!=baseDoctorDO){
                if (null==baseDoctorDO.getAppletQrCode()||"".equals(baseDoctorDO.getAppletQrCode())){
                    // 二维码图片文件名
@@ -429,7 +429,7 @@ public class QrcodeService {
    public ObjEnvelop getWXUserInfo(String patient) throws Exception{
        BasePatientDO basePatientDO = basePatientDao.findById(patient);
        BasePatientDO basePatientDO = basePatientDao.getOne(patient);
        ObjEnvelop objEnvelop = new ObjEnvelop();
        if (null!=basePatientDO){
            String openId=basePatientDO.getOpenid();

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/consult/ReservationSettingService.java

@@ -40,7 +40,7 @@ public class ReservationSettingService extends BaseJpaService<WlyyHospitalReserv
            wlyyHospitalReservationSettingDO.setReservationStatus(Integer.parseInt(dataDetail.get("reservationStatus").toString()));
            wlyyHospitalReservationSettingDO = reservationSettingDao.save(wlyyHospitalReservationSettingDO);
        }else{
            WlyyHospitalReservationSettingDO wlyyHospitalReservationSettingDOL = reservationSettingDao.findById(id);
            WlyyHospitalReservationSettingDO wlyyHospitalReservationSettingDOL = reservationSettingDao.getOne(id);
            wlyyHospitalReservationSettingDOL.setDept(dataDetail.get("dept").toString());
            wlyyHospitalReservationSettingDOL.setDeptName(dataDetail.get("deptName").toString());
            wlyyHospitalReservationSettingDOL.setDoctor(dataDetail.get("doctor").toString());
@@ -58,7 +58,7 @@ public class ReservationSettingService extends BaseJpaService<WlyyHospitalReserv
    public void deleteReservationSetting(String id){
        reservationSettingDao.delete(id);
        reservationSettingDao.deleteById(id);
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/consult/SysDictService.java

@@ -43,7 +43,7 @@ public class SysDictService {
            wlyyHospitalSysDictDO.setDictValue(dictValue);
            wlyyHospitalSysDictDO = sysDictDao.save(wlyyHospitalSysDictDO);
        }else{
            WlyyHospitalSysDictDO wlyyHospitalSysDictDOL = sysDictDao.findById(id);
            WlyyHospitalSysDictDO wlyyHospitalSysDictDOL = sysDictDao.getOne(id);
            wlyyHospitalSysDictDOL.setDictValue(dictValue);
            wlyyHospitalSysDictDO = sysDictDao.save(wlyyHospitalSysDictDOL);
        }

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/consult/WlyyPatientExpressageAddrService.java

@@ -72,7 +72,7 @@ public class WlyyPatientExpressageAddrService extends BaseJpaService<WlyyPatient
    @Transactional(rollbackFor = Exception.class)
    public Object setAddrDefault(String patient,String id)throws Exception{
        StringBuilder error = new StringBuilder("OK");
        WlyyPatientExpressageAddrDO newDefaultAddr = patientExpressageAddrDao.findOne(id);
        WlyyPatientExpressageAddrDO newDefaultAddr = patientExpressageAddrDao.getOne(id);
        if(null == newDefaultAddr){
            error.replace(0,2,"当前地址不存在!");
            return error;

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/wechat/WeiXinEventProcess.java

@@ -89,7 +89,7 @@ public class WeiXinEventProcess {
            String[] keys = eventKey.replace("doctor_", "").split("_");
            // 图片URL
            String picUrl = "";
            BaseDoctorDO baseDoctorDO = baseDoctorDao.findById(keys[0]);
            BaseDoctorDO baseDoctorDO = baseDoctorDao.findByIdAndDel(keys[0]);
            String url = null;
            if (null!=baseDoctorDO){
                picUrl = baseDoctorDO.getPhoto();