Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

Conflicts:
	common/common-entity/src/main/java/com/yihu/jw/entity/specialist/rehabilitation/RehabilitationTemplateDetailDO.java

common/common-entity/src/main/java/com/yihu/jw/entity/base/patient/BasePatientDO.java

@@ -6,6 +6,7 @@ import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date;
@@ -273,6 +274,11 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
    private Integer archiveStatus;//档案状态【1.未管理 2.死亡 3.正常 4.高危】【必填】
    private Integer archiveType;// 档案类型 1老人 2新生儿
    private String archiveStatusName;
    private String archiveTypeName;
    private String bloodName;
    private String marriageName;
    public String getCardType() {
        return cardType;
    }
@@ -796,4 +802,40 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
    public void setMedicareNumber(String medicareNumber) {
        this.medicareNumber = medicareNumber;
    }
    @Transient
    public String getArchiveStatusName() {
        return archiveStatusName;
    }
    public void setArchiveStatusName(String archiveStatusName) {
        this.archiveStatusName = archiveStatusName;
    }
    @Transient
    public String getArchiveTypeName() {
        return archiveTypeName;
    }
    public void setArchiveTypeName(String archiveTypeName) {
        this.archiveTypeName = archiveTypeName;
    }
    @Transient
    public String getBloodName() {
        return bloodName;
    }
    public void setBloodName(String bloodName) {
        this.bloodName = bloodName;
    }
    @Transient
    public String getMarriageName() {
        return marriageName;
    }
    public void setMarriageName(String marriageName) {
        this.marriageName = marriageName;
    }
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/common/DictService.java

@@ -18,6 +18,19 @@ public class DictService {
    @Autowired
    private JdbcTemplate jdbcTemplate;
    /**
     * 字典翻译
     * @param dictName
     * @param code
     * @return
     */
    public String fingByNameAndCode(String dictName,String code){
        if(StringUtils.isBlank(dictName)||StringUtils.isBlank(code)||"null".equals(code)){
            return null;
        }
        String sql = "select dict_value from wlyy_hospital_sys_dict where dict_name = '"+dictName+"' and dict_code = '"+code+"'";
        return jdbcTemplate.queryForObject(sql,String.class);
    }
    //查字典
    public MixEnvelop findDictsByNameCode(String modelName,String name,String code,String value,Integer page ,Integer pageSize){

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/patient/CarePatientService.java

@@ -1,7 +1,11 @@
package com.yihu.jw.care.service.patient;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.care.service.common.DictService;
import com.yihu.jw.care.service.sign.ServicePackageService;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.base.servicePackage.ServicePackageSignRecordDO;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.patient.service.BasePatientMedicardCardService;
import com.yihu.jw.restmodel.web.PageEnvelop;
@@ -10,6 +14,7 @@ import com.yihu.jw.utils.StringUtil;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.repository.CrudRepository;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -35,9 +40,12 @@ public class CarePatientService<T, R extends CrudRepository> extends BaseJpaServ
    @Autowired
    private BasePatientMedicardCardService basePatientMedicardCardService;
    @Autowired
    private ServicePackageService servicePackageService;
    @Autowired
    private ObjectMapper objectMapper;
    @Autowired
    private DictService dictService;
    /**
     * 签约记录
@@ -81,8 +89,43 @@ public class CarePatientService<T, R extends CrudRepository> extends BaseJpaServ
     * @param patientId
     * @return
     */
    public BasePatientDO findPatientById(String patientId) throws Exception{
        return basePatientDao.findById(patientId);
    public JSONObject findPatientById(String patientId) throws Exception{
        JSONObject res = new JSONObject();
        BasePatientDO patientDO = basePatientDao.findById(patientId);
        patientDO.setArchiveStatusName(dictService.fingByNameAndCode("archiveStatus",String.valueOf(patientDO.getArchiveStatus())));
        patientDO.setNationalName(dictService.fingByNameAndCode("national",String.valueOf(patientDO.getNational())));
        patientDO.setArchiveTypeName(dictService.fingByNameAndCode("archiveType",String.valueOf(patientDO.getArchiveType())));
        patientDO.setBloodName(dictService.fingByNameAndCode("blood",String.valueOf(patientDO.getBlood())));
        patientDO.setMarriageName(dictService.fingByNameAndCode("marriage_status",String.valueOf(patientDO.getMarriage())));
        res.put("patient",patientDO);
        String sql = "select * from base_service_package_sign_record where patient = '"+patientId+"' and status = 1 limit 1";
        List<ServicePackageSignRecordDO> signRecordDOs = jdbcTemplate.query(sql,new BeanPropertyRowMapper(ServicePackageSignRecordDO.class));
        if(signRecordDOs.size()>0){
            ServicePackageSignRecordDO signRecordDO = signRecordDOs.get(0);
            String signId = signRecordDO.getId();
            List<Map<String,Object>> packageList = servicePackageService.fingdBySignId(signId);
            List<Map<String,Object>> doctorList = servicePackageService.fingdDoctorBySignId(signId,"generalDoctor");
            List<Map<String,Object>> helperList = servicePackageService.fingdDoctorBySignId(signId,"helper");
            String doctorInfo = "";
            String helperInfo = "";
            String packageInfo = "";
            if(doctorList.size()>0){
                doctorInfo = doctorList.get(0).get("name").toString()+"等"+doctorList.size()+"名";
            }
            if(helperList.size()>0){
                helperInfo = doctorList.get(0).get("name").toString()+"等"+helperList.size()+"名";
            }
            if(packageList.size()>0){
                packageInfo = packageList.get(0).get("name").toString()+"等"+packageList.size()+"个";
            }
            signRecordDO.setDoctorInfo(doctorInfo);
            signRecordDO.setHelperInfo(helperInfo);
            signRecordDO.setPackageInfo(packageInfo);
            res.put("signRecordDO",signRecordDO);
        }
        return res;
    }
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/statistics/StatisticsService.java

@@ -1,5 +1,6 @@
package com.yihu.jw.care.service.statistics;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.care.util.ConstantUtil;
import com.yihu.jw.es.util.ElasticsearchUtil;
import org.slf4j.Logger;
@@ -29,16 +30,22 @@ public class StatisticsService {
     * @param startTime
     * @param endTime
     */
    public void indexTopNum(String area,String startTime,String endTime,String level){
        String signSql = " select count(s.id) from base_service_package_sign_record";
    public JSONObject indexTopNum(String area,String startTime,String endTime,String level){
        JSONObject re = new JSONObject();
        String signSql = "select count(s.id) from base_service_package_sign_record s";
        String capacitySql = "select count(c.id) from base_capacity_assessment_record c";
        //签约数 能力评估
        if(ConstantUtil.CITY.equals(area)){
            signSql += "";
        }
            signSql += " where s.status = 1";
        }else{
        }
        Integer signNum = jdbcTemplate.queryForObject(signSql,Integer.class);
        Integer capacityNum = jdbcTemplate.queryForObject(capacitySql,Integer.class);
        re.put("signNum",signNum);
        re.put("capacityNum",capacityNum);
        return re;
    }