Merge branch 'dev' of wangjun/wlyy2.0 into dev

business/base-service/src/main/java/com/yihu/jw/dict/dao/PrivateDictDao.java

@@ -0,0 +1,16 @@
package com.yihu.jw.dict.dao;
import com.yihu.jw.entity.hospital.dict.PrivateDictDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
public interface PrivateDictDao extends PagingAndSortingRepository<PrivateDictDO, String>, JpaSpecificationExecutor<PrivateDictDO> {
    @Query("from PrivateDictDO t where t.hospitalCode =?1 and t.dictCode= ?2 and t.isDel = 1")
    List<PrivateDictDO> findoneByCodeAndWechatId(String hospitalCode, String dictCode);
    @Query("from PrivateDictDO t where t.isDel = 1")
    List<PrivateDictDO> findALL();
}

business/base-service/src/main/java/com/yihu/jw/dict/service/PrivateDictService.java

@@ -0,0 +1,70 @@
package com.yihu.jw.dict.service;
import com.yihu.jw.dict.dao.PrivateDictDao;
import com.yihu.jw.entity.hospital.dict.PrivateDictDO;
import com.yihu.jw.entity.hospital.message.BaseBannerDO;
import com.yihu.jw.hospital.message.dao.BaseBannerDao;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.utils.StringUtil;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class PrivateDictService extends BaseJpaService<PrivateDictDO, PrivateDictDao> {
    @Autowired
    private PrivateDictDao privateDictDao;
    @Autowired
    private HibenateUtils hibenateUtils;
    //查找隐私策略
    public List<PrivateDictDO> findByHospitalCodeAndDictCode(String hospitalCode,String dictCode){
        if (StringUtils.isNotBlank(hospitalCode)&&StringUtils.isNotBlank(dictCode)){
            return privateDictDao.findoneByCodeAndWechatId(hospitalCode,dictCode);
        }else {
            return privateDictDao.findALL();
        }
    }
    //添加隐私策略
    public MixEnvelop addPrivateDict(String id,String dictCode,String dictName, String dictValue,String hospitalCode,String hospitalName,String imgUrl){
        PrivateDictDO  privateDictDO = new PrivateDictDO();
        MixEnvelop mixEnvelop = new MixEnvelop();
        if (StringUtils.isNotBlank(id)){
            privateDictDO = privateDictDao.findOne(id);
        }
        if (StringUtils.isNotBlank(dictCode)){
            privateDictDO.setDictCode(dictCode);
            privateDictDO.setDictValue(dictValue);
            privateDictDO.setDictName(dictName);
            privateDictDO.setIsDel(1);
            privateDictDO.setHospitalCode(hospitalCode);
            privateDictDO.setHospitalName(hospitalName);
            privateDictDO.setImgUrl(imgUrl);
            privateDictDao.save(privateDictDO);
            mixEnvelop.setMessage("success");
            mixEnvelop.setStatus(200);
        }else{
            mixEnvelop.setMessage("隐私政策code不能为空");
            mixEnvelop.setStatus(-1);
        }
        return mixEnvelop;
    }
    //删除隐私政策
    public MixEnvelop deleteById(String id){
        PrivateDictDO  privateDictDO = privateDictDao.findOne(id);
        MixEnvelop mixEnvelop = new MixEnvelop();
        if (null!=privateDictDO){
            privateDictDao.delete(id);
            mixEnvelop.setStatus(200);
            mixEnvelop.setMessage("删除成功");
        }else {
            mixEnvelop.setStatus(-1);
            mixEnvelop.setMessage("删除失败");
        }
        return mixEnvelop;
    }
}

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

@@ -521,7 +521,12 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        rs.put("address", basePatientDO.getAddress());
        rs.put("mobile", basePatientDO.getMobile());
        rs.put("birthday", DateUtil.dateToStr(basePatientDO.getBirthday(), "yyyy-MM-dd"));
        String hisPatient="";
        PatientMappingDO patientMappingDO = patientMappingDao.findByPatient(basePatientDO.getId());
        if(null!=patientMappingDO){
            hisPatient = patientMappingDO.getMappingCode();
        }
        rs.put("hisPatient",hisPatient);
        Long time = new Date().getTime() - outpatientDO.getCreateTime().getTime();
        rs.put("time", time);
@@ -8532,4 +8537,5 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
    public void updateHisStatusByOutpatientId(String outpatientId){
        outpatientDao.updateHisStatusById(outpatientId,1);
    }
}

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

@@ -238,7 +238,6 @@ public class YkyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
            }
            System.out.println("进入物流信息");
            expressageDO.setDel(1);
            expressageDO.setAddress(expressageDO.getHospitalAddress());
            expressageDO.setCreateTime(new Date());
            expressageDO.setOutpatientId(outpatient.getId());
            prescriptionExpressageDao.save(expressageDO);
@@ -387,7 +386,7 @@ public class YkyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
        for (int i=0;i<mapList.size();i++){
            JSONObject map = mapList.getJSONObject(i);
            JSONObject object = new JSONObject();
            object.put("charge_code",map.get("ypdm"));
            object.put("charge_code",map.get("ypxh"));
            object.put("drugname",map.get("ypmc"));
            object.put("specification",map.get("yfgg"));
            object.put("pack_unit_name",map.get("jldw"));

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

@@ -3077,7 +3077,7 @@ public class ImService {
					"wlyy_consult_team b," +
					"base_patient d  " +
					" WHERE a.id=b.consult " +
					" AND b.patient=d.id AND b.doctor='" + doctorCode + "' AND b.type in (1,15,17) and b.status = 0 " +
					" AND b.patient=d.id AND b.doctor='" + doctorCode + "' AND b.type in (1,15,17) and b.status = 0 and a.pay_status=1" +
					" ORDER BY a.czrq desc ";
		List<Map<String, Object>> rstotal = jdbcTemplate.queryForList(sql);
		Long consultCount = 0l;

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/dict/PrivateDictDO.java

@@ -0,0 +1,91 @@
package com.yihu.jw.entity.hospital.dict;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Entity;
import javax.persistence.Table;
@Entity
@Table(name = "private_dict")
public class PrivateDictDO extends UuidIdentityEntityWithOperator {
    /*
     * dictCode
     */
    private String dictCode;
    /*
     * dictName
     */
    private String dictName;
    /*
     * dictValue
     */
    private String dictValue;
    /*
     * 是否删除
     */
    private Integer isDel;
    /*
     * hospitalCode
     */
    private String hospitalCode;
    private String hospitalName;
    private String imgUrl;
    public String getImgUrl() {
        return imgUrl;
    }
    public void setImgUrl(String imgUrl) {
        this.imgUrl = imgUrl;
    }
    public String getDictName() {
        return dictName;
    }
    public void setDictName(String dictName) {
        this.dictName = dictName;
    }
    public String getHospitalCode() {
        return hospitalCode;
    }
    public void setHospitalCode(String hospitalCode) {
        this.hospitalCode = hospitalCode;
    }
    public String getHospitalName() {
        return hospitalName;
    }
    public void setHospitalName(String hospitalName) {
        this.hospitalName = hospitalName;
    }
    public String getDictCode() {
        return dictCode;
    }
    public void setDictCode(String dictCode) {
        this.dictCode = dictCode;
    }
    public String getDictValue() {
        return dictValue;
    }
    public void setDictValue(String dictValue) {
        this.dictValue = dictValue;
    }
    public Integer getIsDel() {
        return isDel;
    }
    public void setIsDel(Integer isDel) {
        this.isDel = isDel;
    }
}

common/common-request-mapping/src/main/java/com/yihu/jw/rm/hospital/BaseHospitalRequestMapping.java

@@ -1196,6 +1196,15 @@ public class BaseHospitalRequestMapping {
        public static final String downBanner = "/downBanner";
        public static final String onOff = "/onOff";
    }
    /**
     * 隐私策略管理
     */
    public static class PrivateDictManager extends Basic{
        public static final String privateDictManager = "/privateDictManager";
        public static final String findPrivateDict  = "/findPrivateDict";
        public static final String savePrivateDict = "/savePrivateDict";
        public static final String delPrivateDict = "/delPrivateDict";
    }
    /**
     * 患者家人关系管理
     */
@@ -1366,6 +1375,10 @@ public class BaseHospitalRequestMapping {
        public static final String querySettledRecord="/querySettledRecord";
        public static final String paySuccessNotice="/paySuccessNotice";
        public static final String findHisPatientInfo="/findHisPatientInfo";
        public static final String privateDictManager = "/privateDictManager";
        public static final String findPrivateDict  = "/findPrivateDict";
        public static final String savePrivateDict = "/savePrivateDict";
        public static final String delPrivateDict = "/delPrivateDict";
    }
    /**

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

@@ -0,0 +1,63 @@
package com.yihu.jw.hospital.endpoint.dict;
import com.yihu.jw.dict.service.PrivateDictService;
import com.yihu.jw.hospital.endpoint.message.SystemMessageController;
import com.yihu.jw.hospital.message.service.BaseBannerService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping(value = BaseHospitalRequestMapping.PatientNoLogin.PREFIX)
@Api(value = "隐私策略管理", description = "隐私策略管理", tags = {"互联网医院 - 隐私策略管理"})
public class PrivateDictEndpoint extends EnvelopRestEndpoint {
    private static Logger logger = LoggerFactory.getLogger(PrivateDictEndpoint.class);
    @Autowired
    private PrivateDictService privateDictService;
    @ApiOperation("查询隐私策略")
    @PostMapping(value= BaseHospitalRequestMapping.PatientNoLogin.findPrivateDict)
    public Envelop findPrivateDict(@ApiParam(name = "dictCode", value = "隐私code")
                                    @RequestParam(value = "dictCode", required = false) String dictCode,
                                    @ApiParam(name = "hospitalCode", value = "医院code")
                                    @RequestParam(value = "hospitalCode", required = false) String hospitalCode){
        return success(privateDictService.findByHospitalCodeAndDictCode(hospitalCode,dictCode));
    }
    @PostMapping(value= BaseHospitalRequestMapping.PatientNoLogin.savePrivateDict)
    @ApiOperation("更新/新增隐私策略")
    public MixEnvelop savePrivateDict(
            @ApiParam(name = "id", value = "id", required = true)
            @RequestParam(value = "id", required = true)String id,
            @ApiParam(name = "dictCode", value = "dictCode", required = false)
            @RequestParam(value = "dictCode", required = false)String dictCode,
            @ApiParam(name = "dictName", value = "dictName", required = false)
            @RequestParam(value = "dictName", required = false)String dictName,
            @ApiParam(name = "dictValue", value = "dictValue", required = false)
            @RequestParam(value = "dictValue", required = false)String dictValue,
            @ApiParam(name = "hospitalCode", value = "hospitalCode", required = false)
            @RequestParam(value = "hospitalCode", required = false)String hospitalCode,
            @ApiParam(name = "hospitalName", value = "hospitalName", required = false)
            @RequestParam(value = "hospitalName", required = false)String hospitalName,
            @ApiParam(name = "imgUrl", value = "imgUrl", required = false)
            @RequestParam(value = "imgUrl", required = false)String imgUrl)throws Exception {
        MixEnvelop mixEnvelop =privateDictService.addPrivateDict(id,dictCode,dictName,dictValue,hospitalCode,hospitalName,imgUrl);
        return mixEnvelop;
    }
    @ApiOperation("删除隐私策略")
    @GetMapping(value= BaseHospitalRequestMapping.PatientNoLogin.delPrivateDict)
    public MixEnvelop delPrivateDict(@ApiParam(name = "id", value = "id", required = true)
                                         @RequestParam(value = "id", required = true)String id){
        MixEnvelop mixEnvelop =privateDictService.deleteById(id);
        return mixEnvelop;
    }
}