修改bug

business/base-service/src/main/java/com/yihu/jw/hospital/disease/service/BaseDiseaseHospitalService.java

@@ -257,6 +257,7 @@ public class BaseDiseaseHospitalService extends BaseJpaService<BaseDiseaseHospit
            filter += " and ssr.czrq<='"+endDate+" 23:59:59' ";
        }
        String orderBy = " order by id desc limit "+(page-1)*size+","+size;
        System.out.println(sql+filter+orderBy);
        List<Map<String, Object>> list = jdbcTemplate.queryForList(sql+filter+orderBy);
        for (Map<String, Object> vo : list) {
            String idcard = vo.get("idcard")+"";

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

@@ -7455,6 +7455,8 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        if ("1".equals(isNurse)) {
            sql += " AND jt.saas_id = 'hlys' ";
        }else  if ("0".equals(isNurse)){
            sql += " AND jt.saas_id != 'hlys' ";
        }
        if (StringUtils.isNotBlank(jobTitleNameKey)) {

business/base-service/src/main/java/com/yihu/jw/patient/service/BasePatientService.java

@@ -416,39 +416,44 @@ public class BasePatientService<T, R extends CrudRepository> extends BaseJpaServ
            throw new Exception("用户不存在");
        }
        Boolean flag = healthCareService.isHospitalFlag();
        if (flag) {
            if (wxId.equalsIgnoreCase("xm_xzzx_wx")) {
                String result = healthCareService.authorizedToEntrace(basePatientDO.getId());
                JSONObject object = JSONObject.parseObject(result);
                if (object.getString("flag").equalsIgnoreCase("1")) {
                    JSONObject encryptData = object.getJSONObject("encrypt_data");
                    String state = encryptData.getString("state");
                    String auth_date = encryptData.getString("auth_date");
                    basePatientDO.setMedicalState(state);
                    basePatientDO = basePatientDao.save(basePatientDO);
                }
            } else if (wxId.equalsIgnoreCase("xm_zsyy_wx")){
                String result = healthCareService.authorized(basePatientDO.getId());
                JSONObject object = JSONObject.parseObject(result);
                if (object.getString("flag").equalsIgnoreCase("1")) {
                    JSONObject encryptData = object.getJSONObject("encrypt_data");
                    String state = encryptData.getString("state");
                    String auth_date = encryptData.getString("auth_date");
                    basePatientDO.setMedicalState(state);
                    basePatientDO = basePatientDao.save(basePatientDO);
                }
            }else {
                String result = healthCareNewService.authorized(basePatientDO.getId());
                JSONObject object = JSONObject.parseObject(result);
                if (object.getString("flag").equalsIgnoreCase("1")) {
                    JSONObject encryptData = object.getJSONObject("encrypt_data");
                    String state = encryptData.getString("state");
                    String auth_date = encryptData.getString("auth_date");
                    basePatientDO.setMedicalState(state);
                    basePatientDO = basePatientDao.save(basePatientDO);
        try {
            if (flag) {
                if (wxId.equalsIgnoreCase("xm_xzzx_wx")) {
                    String result = healthCareService.authorizedToEntrace(basePatientDO.getId());
                    JSONObject object = JSONObject.parseObject(result);
                    if (object.getString("flag").equalsIgnoreCase("1")) {
                        JSONObject encryptData = object.getJSONObject("encrypt_data");
                        String state = encryptData.getString("state");
                        String auth_date = encryptData.getString("auth_date");
                        basePatientDO.setMedicalState(state);
                        basePatientDO = basePatientDao.save(basePatientDO);
                    }
                } else if (wxId.equalsIgnoreCase("xm_zsyy_wx")){
                    String result = healthCareService.authorized(basePatientDO.getId());
                    JSONObject object = JSONObject.parseObject(result);
                    if (object.getString("flag").equalsIgnoreCase("1")) {
                        JSONObject encryptData = object.getJSONObject("encrypt_data");
                        String state = encryptData.getString("state");
                        String auth_date = encryptData.getString("auth_date");
                        basePatientDO.setMedicalState(state);
                        basePatientDO = basePatientDao.save(basePatientDO);
                    }
                }else {
                    String result = healthCareNewService.authorized(basePatientDO.getId());
                    JSONObject object = JSONObject.parseObject(result);
                    if (object.getString("flag").equalsIgnoreCase("1")) {
                        JSONObject encryptData = object.getJSONObject("encrypt_data");
                        String state = encryptData.getString("state");
                        String auth_date = encryptData.getString("auth_date");
                        basePatientDO.setMedicalState(state);
                        basePatientDO = basePatientDao.save(basePatientDO);
                    }
                }
            }
        }catch (Exception e){
            e.printStackTrace();
        }
        return basePatientDO;
    }

business/es-service/src/main/java/com/yihu/jw/es/service/StatisticsEsService.java

@@ -8319,7 +8319,7 @@ public class StatisticsEsService {
                "	wlyy_outpatient \n" +
                "WHERE 1=1\n" +
                "	AND pay_status IN ( '1', '2' ) \n" +
                "	AND outpatient_type='3' AND type IN('1','2')\n" +
                "	AND outpatient_type='1' AND type IN('1','2')\n" +
                "	AND icd10_name IS NOT NULL \n" +
                "GROUP BY\n" +
                "	icd10,icd10_name \n" +

business/im-service/src/main/java/com/yihu/jw/im/service/ImService.java

@@ -4546,7 +4546,13 @@ public class ImService {
                sql += " AND op.type =2 and op.outpatient_type = 3";
            } else if (type.equalsIgnoreCase("12")) {
                sql += " AND op.outpatient_type = 2";
            } else {
            } else if (type.equalsIgnoreCase("28")) {
                sql += " AND op.outpatient_type = 4"; //康复咨询
            } else if (type.equalsIgnoreCase("29")) {
                sql += " AND op.outpatient_type = 1 and  oh.id is not null "; //住院申请咨询
            } else if (type.equalsIgnoreCase("30")) {
                sql += " AND op.outpatient_type = 5";//护理咨询
            }  else {
                sql += " AND op.type in (1,2,3) ";
            }
        }

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

@@ -85,6 +85,15 @@ public class KnowledgeArticleDictDO extends UuidIdentityEntity {
	private Date releaseTime;
	private Integer flag;//1文章2健康教育
	public Integer getFlag() {
		return flag;
	}
	public void setFlag(Integer flag) {
		this.flag = flag;
	}
	@Transient
	private String sendDoctorCode;

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/dict/DictHospitalDeptVO.java

@@ -55,6 +55,20 @@ public class DictHospitalDeptVO extends IntegerIdentityVO{
    private String deptTypeCode;
    /**
     * 科室logo
     */
    @ApiModelProperty(value = "科室logo", example = "科室logo")
    private String deptLogo;
    public String getDeptLogo() {
        return deptLogo;
    }
    public void setDeptLogo(String deptLogo) {
        this.deptLogo = deptLogo;
    }
    public String getOrgCode() {
        return orgCode;
    }

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

@@ -88,6 +88,7 @@ public class ArticleDictEndpoint extends EnvelopRestEndpoint {
            filters += ";type=2";
            List<KnowledgeArticleDictDO> list = knowledgeArticleDictService.search(fields, filters, sorts, page, pageSize);
            for (KnowledgeArticleDictDO articleDictDO : list) {
                JSONObject object = menuManageService.findArticleStaticsByArticleId(articleDictDO.getId());
                if (object != null) {
                    articleDictDO.setCollection(Integer.parseInt(object.getString("collectTotal")));