[医保代码]

business/base-service/src/main/java/com/yihu/jw/hospital/message/service/BaseUserMsgService.java

@@ -199,14 +199,23 @@ public class BaseUserMsgService extends BaseJpaService<BaseUserMessageDO, BaseUs
        baseUserMsgContentDao.save(baseUserMsgContentDO);
    }
    //修改留言显示
    @Transactional
    public BaseUserMessageDO updateIsShow(String id,Integer isShow) {
        BaseUserMessageDO baseUserMessageDOS = baseUserMessageDao.findOne(id);
        baseUserMessageDOS.setIsShow(isShow);
        return baseUserMessageDao.save(baseUserMessageDOS);
    }
    //评论留言展示
    public Envelop getMessage(String doctor, String showAll, String showAllType, String beginTime, String endTime,String patient, Integer page, Integer pageSize) {
    public Envelop getMessage(String doctor, String showAll, String showAllType, String beginTime, String endTime,String patient, Integer page, Integer pageSize,Integer isShow) {
        StringBuffer sql = new StringBuffer();
        Map<String,Object> params = new HashedMap();
        sql.append("select t.id as \"id\" ,t.content as \"content\",t.type as \"type\"," +
                "t.sender as \"sender\",t.sender_name as \"sender_name\",t.receiver as \"receiver\"," +
                "t.receiver_name as \"receiver_name\",t.relation_type as \"relation_type\"," +
                "t.relation_code as \"relation_code\",t.relation_name as \"relation_name\",t.status as \"status\",t.update_time as \"update_time\"");
                "t.relation_code as \"relation_code\",t.relation_name as \"relation_name\",t.status as \"status\",t.is_show as \"isShow\",t.update_time as \"update_time\"");
        /*if("xm_ykyy_wx".equals(wxId)){
            flag = true;
            if (flag){
@@ -231,6 +240,9 @@ public class BaseUserMsgService extends BaseJpaService<BaseUserMessageDO, BaseUs
        if (StringUtils.isNotEmpty(showAllType)) {
            sql.append(" and t.relation_type = " + showAllType);
        }
        if (isShow!=null) {
            sql.append(" and t.is_show = " + isShow);
        }
        if (StringUtils.isNotEmpty(beginTime)) {
            //sql.append(" and t.update_time > '" + beginTime+"'");//DateUtil.stringToDate(beginTime,"yyyy-MM-dd HH:mm:ss")
            if ("xm_ykyy_wx".equals(wxId)) {
@@ -302,7 +314,7 @@ public class BaseUserMsgService extends BaseJpaService<BaseUserMessageDO, BaseUs
                }
            }
            baseUserMsgDO.setIsShow(null==map.get("isShow")?0:Integer.parseInt(map.get("isShow").toString()));
            baseUserMsgDO.setContent(content);
            baseUserMsgDO.setRelationCode(null==map.get("relation_code")?"":map.get("relation_code").toString());
            baseUserMsgDO.setRelationType(null==map.get("relation_type")?0:Integer.valueOf(map.get("relation_type").toString()));

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

@@ -99,4 +99,8 @@ public interface OutpatientDao extends PagingAndSortingRepository<WlyyOutpatient
    List<WlyyOutpatientDO> findByDoctorAndOutpatientType(String doctor,String outpatientType,String patient);
    @Query("from WlyyOutpatientDO a where a.consumer = ?1 and a.status in(1,2,3) and a.payStatus =1 order by a.createTime desc")
    List<WlyyOutpatientDO> findOutpatientAndPatient(String patient);
}

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

@@ -1374,6 +1374,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            JSONObject data = new JSONObject();
            data.put("name", outpatient.getPatientName());
            data.put("consumerName",outpatient.getConsumerName());
            data.put("age", IdCardUtil.getAgeForIdcard(outpatient.getIdcard()));
            data.put("gender", IdCardUtil.getSexForIdcard_new(outpatient.getIdcard()));
            data.put("recipeType", prescriptionDO.getDispensaryType());
@@ -4404,6 +4405,17 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                }
            }
            //医生关注
            if(StringUtils.isNotBlank(patient)){
                List<WlyyOutpatientDO> wlyyOutpatientDOList= outpatientDao.findOutpatientAndPatient(patient);
                if (wlyyOutpatientDOList != null && wlyyOutpatientDOList.size() > 0) {
                    rs.put("isComment", "1");
                } else {
                    rs.put("isComment", "0");
                }
            }
            //专家咨询
            String zjCountsql = "SELECT id AS \"id\" FROM wlyy_consult_team WHERE doctor='" + doctor + "' AND (type=1 OR type=15)";
@@ -4778,6 +4790,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            try {
                data.put("name", wlyyOutpatientDO.getPatientName());
                data.put("consumerName",wlyyOutpatientDO.getConsumerName());
                data.put("age", IdCardUtil.getAgeForIdcard(wlyyOutpatientDO.getIdcard()));
                data.put("gender", IdCardUtil.getSexForIdcard(wlyyOutpatientDO.getIdcard()));
                data.put("question", wlyyOutpatientDO.getIcd10Name());
@@ -8271,6 +8284,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                systemMessageDO.setSenderName(outpatient.getPatientName());
                systemMessageDO.setRelationCode(outpatient.getId());
                data.put("name", outpatient.getPatientName());
                data.put("consumerName",outpatient.getConsumerName());
                data.put("age", IdCardUtil.getAgeForIdcard(outpatient.getIdcard()));
                data.put("gender", IdCardUtil.getSexForIdcard_new(outpatient.getIdcard()));
                data.put("question", outpatient.getDescription());
@@ -8316,6 +8330,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                systemMessageDO.setSenderName(outpatient.getPatientName());
                systemMessageDO.setRelationCode(outpatient.getId());
                data.put("name", outpatient.getPatientName());
                data.put("consumerName",outpatient.getConsumerName());
                data.put("age", IdCardUtil.getAgeForIdcard(outpatient.getIdcard()));
                data.put("gender", IdCardUtil.getSexForIdcard_new(outpatient.getIdcard()));
                data.put("question", outpatient.getDescription());
@@ -8359,6 +8374,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                data.put("name", outpatient.getPatientName());
                data.put("age", IdCardUtil.getAgeForIdcard(outpatient.getIdcard()));
                data.put("gender", IdCardUtil.getSexForIdcard_new(outpatient.getIdcard()));
                data.put("consumerName",outpatient.getConsumerName());
                data.put("question", outpatient.getDescription());
                data.put("msg", msg);
                systemMessageDO.setData(data.toString());
@@ -8413,6 +8429,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                data.put("name", outpatient.getPatientName());
                data.put("age", IdCardUtil.getAgeForIdcard(outpatient.getIdcard()));
                data.put("gender", IdCardUtil.getSexForIdcard_new(outpatient.getIdcard()));
                data.put("consumerName",outpatient.getConsumerName());
                data.put("question", outpatient.getDescription());
                data.put("msg", msg);
                data.put("type", type);
@@ -8451,6 +8468,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            try {
                data.put("name", patientDO.getName());
                data.put("age", IdCardUtil.getAgeForIdcard(patientDO.getIdcard()));
                data.put("consumerName",outpatient.getConsumerName());
                data.put("gender", IdCardUtil.getSexForIdcard_new(patientDO.getIdcard()));
                data.put("question", consultTeamDo.getSymptoms());
                data.put("msg", msg);
@@ -9938,7 +9956,16 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                age = IdCardUtil.getAgeForIdcard(patientDO.getIdcard());
                gender = IdCardUtil.getSexForIdcard(patientDO.getIdcard());
            }
            WlyyOutpatientDO wlyyOutpatientDO = outpatientDao.findById(prescriptionDO.getOutpatientId());
            String conditiaon="";
            if (wlyyOutpatientDO!=null){
                data.put("consumerName",wlyyOutpatientDO.getConsumerName());
                if (!wlyyOutpatientDO.getConsumerName().equalsIgnoreCase(prescriptionDO.getPatientName())){
                    conditiaon = "("+wlyyOutpatientDO.getConsumerName()+"代问诊)";
                }
            }
            data.put("name", prescriptionDO.getPatientName());
            data.put("age", age);
            data.put("gender", gender);
            data.put("outpatientId", prescriptionDO.getOutpatientId());
@@ -9947,7 +9974,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                systemMessageDO.setType("9");
                systemMessageDO.setTitle("审方通过");
                data.put("message", "审方通过");
                data.put("message", "您为" + prescriptionDO.getPatientName() + "（" + age + "岁 " + gender + "）开具的处方已审核通过。");
                data.put("message", "您为" + prescriptionDO.getPatientName() +conditiaon+"（" + age + "岁 " + gender + "）开具的处方已审核通过。");
                /**
                 *  * @param userName      推送人姓名
                 * @param idCard        推送人身份证
@@ -9973,7 +10000,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                systemMessageDO.setType("8");
                systemMessageDO.setTitle("审方退回");
                data.put("message", "审方退回");
                data.put("message", "您为" + prescriptionDO.getPatientName() + "（" + age + "岁 " + gender + "）开具的处方被审方退回，请尽快处理");
                data.put("message", "您为" + prescriptionDO.getPatientName() +conditiaon+ "（" + age + "岁 " + gender + "）开具的处方被审方退回，请尽快处理");
            }
            systemMessageDO.setData(data.toString());
            systemMessageService.saveMessage(systemMessageDO);
@@ -11062,7 +11089,9 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                " p.check_status as \"checkStatus\"," +
                " p.id as \"id\"," +
                " p.status as \"status\"," +
                " p.check_reason as \"checkReason\" " +
                " p.check_reason as \"checkReason\", " +
                " o.consumer as \"consumer\", "+
                " o.consumer_name as \"consumerName\" "+
                " from wlyy_prescription p left join wlyy_outpatient o on p.outpatient_id  = o.id" +
                " where  1=1 ";
        if (StringUtils.isNotBlank(keyWord)){
@@ -13879,7 +13908,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                }
            }
            DecimalFormat df = new DecimalFormat("#.00");
            String[] header3 = {"无","无",df.format(Double.parseDouble(price1)),df.format(Double.parseDouble(price1)),"无"};//
            String[] header3 = {"无",startTime+"至"+endTime,df.format(Double.parseDouble(price1)),df.format(Double.parseDouble(price1)),"无"};//
            int k3 = 0;
            for (String h : header3) {
                addCell(ws, 3, k3, h);//表名，行，列，header
@@ -13923,7 +13952,8 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        for (Map<String, Object> map:mapList){
            if (map.get("orderCategory")!=null){
                if(map.get("orderCategory").toString().equalsIgnoreCase("5")){
                    map.put("payPrice",Double.parseDouble(map.get("orderCategory").toString())*100);
                    logger.info("payPrice"+Double.parseDouble(map.get("payPrice").toString())+"===="+Double.parseDouble(map.get("payPrice").toString())*100);
                    map.put("payPrice",Double.parseDouble(map.get("payPrice").toString())*100);
                }
            }
        }
@@ -13994,7 +14024,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            Double price7 = Double.parseDouble(price4);//处方费
            Double price8 = Double.parseDouble(price5);//就诊卡充值
            DecimalFormat df = new DecimalFormat("#.00");
            String[] header3 = {"无",df.format(price6+price7+price8)+"",df.format(price8)+"",df.format(price7)+"",df.format(price6)+""};//
            String[] header3 = {startTime+"至"+endTime,df.format(price6+price7+price8)+"",df.format(price8)+"",df.format(price7)+"",df.format(price6)+""};//
            int k3 = 0;
            for (String h : header3) {
                addCell(ws, 3, k3, h);//表名，行，列，header
@@ -14143,7 +14173,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                addCell(ws, 1, k1, h);//表名，行，列，header
                k1++;
            }
            String[] header2 = {"患者名称","订单药品","规格","总量","单位","进价","零售价","进货金额","零售金额","发药时间","审方时间","开方时间"};//
            String[] header2 = {"患者名称","订单药品","规格","总量","单位","进价","零售价","进货金额","零售金额","发药时间","审方时间","开方时间","开方医生"};//
            int k2 = 0;
            for (String h : header2) {
                addCell(ws, 2, k2, h);//表名，行，列，header
@@ -14179,6 +14209,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                        addCell(ws, i, 9,jsonObject.get("dispDate")!=null?DateUtil.stampToString(jsonObject.get("dispDate").toString()):n);
                        addCell(ws, i, 10,jsonObject.get("checkTime")!=null?DateUtil.stampToString(jsonObject.get("checkTime").toString()):n);
                        addCell(ws, i, 11,jsonObject.get("createTime")!=null?DateUtil.stampToString(jsonObject.get("createTime").toString()):n);
                        addCell(ws, i, 12,jsonObject.get("doctorName")!=null?jsonObject.get("doctorName").toString():n);
                        i++;
                    }
                    ws.mergeCells(0,j,0,i-1);
@@ -14189,8 +14220,8 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            }
            ws.mergeCells(0,0,11,0);
            ws.mergeCells(0,1,11,1);
            ws.mergeCells(0,0,12,0);
            ws.mergeCells(0,1,12,1);
            wwb.write();
            wwb.close();
        } catch (IOException e) {

business/base-service/src/mqConfig/mqdata/BS15018.json

@@ -19,5 +19,15 @@
		"CARD_TYPE_NAME": "社保卡",
		"social_no": "350211198411053024",
		"name":"白海灵"
	},
	{
		"PAT_NO": "P5616242-1",
		"CARD_NO": "DA1872143",
		"CARD_STAT": "激活",
		"OP_DATE": "2014-07-25 08:46:40",
		"CARD_TYPE": "2",
		"CARD_TYPE_NAME": "社保卡",
		"social_no": "230203195211271426",
		"name":"王金妮"
	}]
}

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

@@ -1913,6 +1913,10 @@ public class ImService {
        net.sf.json.JSONObject data = new net.sf.json.JSONObject();
        data.put("name", patient.getName());
        WlyyOutpatientDO wlyyOutpatientDO = outpatientDao.findById(consultTeam.getRelationCode());
        if (wlyyOutpatientDO!=null){
            data.put("consumerName",wlyyOutpatientDO.getConsumerName());
        }
        data.put("age", IdCardUtil.getAgeForIdcard(patient.getIdcard()));
        data.put("gender", StringUtils.isEmpty(patient.getSex()) ? null : patient.getSex().toString());
        data.put("question", consultTeam.getSymptoms());
@@ -3766,6 +3770,7 @@ public class ImService {
                    "patient.NAME AS \"patientName\"," +
                    "patient.id AS \"patientId\"," +
                    "op.consumer AS \"consumer\"," +
                    "op.consumer_name AS \"consumerName\"," +
                    "patient.idcard AS \"patientIdcard\"," +
                    "patient.sex AS \"patientsex\"," +
                    "patient.photo AS \"patientphoto\",";
@@ -3851,6 +3856,7 @@ public class ImService {
                    "op.doctor AS \"doctorCode\"," +
                    "op.general_doctor AS \"generalDoctor\"," +
                    "op.consumer AS \"consumer\"," +
                    "op.consumer_name AS \"consumerName\"," +
                    "patient.NAME AS \"patientName\"," +
                    "patient.id AS \"patientId\"," +
                    "patient.idcard AS \"patientIdcard\"," +
@@ -4542,6 +4548,7 @@ public class ImService {
                    "patient.NAME AS \"patientName\"," +
                    "patient.id AS \"patientId\"," +
                    "op.consumer AS \"consumer\"," +
                    "op.consumer_name AS \"consumerName\"," +
                    "patient.idcard AS \"patientIdcard\"," +
                    "patient.sex AS \"patientsex\"," +
                    "patient.photo AS \"patientphoto\",";
@@ -4626,6 +4633,7 @@ public class ImService {
                    "op.doctor AS \"doctorCode\"," +
                    "op.general_doctor AS \"generalDoctor\"," +
                    "op.consumer AS \"consumer\"," +
                    "op.consumer_name AS \"consumerName\"," +
                    "patient.NAME AS \"patientName\"," +
                    "patient.id AS \"patientId\"," +
                    "patient.idcard AS \"patientIdcard\"," +

common/common-entity/src/main/java/com/yihu/jw/entity/IntegerIdentityEntity.java

@@ -19,13 +19,13 @@ public abstract class IntegerIdentityEntity implements Serializable {
    @Id
//==========mysql 环境 id策略======================================================
 /*   @GeneratedValue(generator = "generator")
    @GeneratedValue(generator = "generator")
    @GenericGenerator(name = "generator", strategy = "identity")
    @Column(name = "id", unique = true, nullable = false)*/
    @Column(name = "id", unique = true, nullable = false)
//==========mysql 环境 id策略 end======================================================
//==========Oracle 环境id策略 =========================================================
   @GeneratedValue(strategy=GenerationType.SEQUENCE, generator="id_generated")
/*   @GeneratedValue(strategy=GenerationType.SEQUENCE, generator="id_generated")*/
//==========Oracle 环境id策略 =========================================================
    public Integer getId() {
        return id;

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

@@ -44,6 +44,7 @@ public class KnowledgeArticleDO extends UuidIdentityEntity {
	@Column(name = "is_share")
	private Integer share;//分享 数量
	private String intro;//简介
	private Integer isShow;//显示首页：1显示0不显示
	@Transient
	private Integer isUsed;//是否已设置常用
@@ -277,4 +278,12 @@ public class KnowledgeArticleDO extends UuidIdentityEntity {
	public void setIntro(String intro) {
		this.intro = intro;
	}
	public Integer getIsShow() {
		return isShow;
	}
	public void setIsShow(Integer isShow) {
		this.isShow = isShow;
	}
}

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/message/BaseUserMessageDO.java

@@ -72,6 +72,11 @@ public class BaseUserMessageDO extends UuidIdentityEntityWithOperator {
     */
    private Integer isRead;
    /**
     * 是否展示1展示、0隐藏
     */
    private Integer isShow;
    /**
     * 返回锦旗集合
     */
@@ -202,4 +207,12 @@ public class BaseUserMessageDO extends UuidIdentityEntityWithOperator {
    public Integer getRelationType() {
        return relationType;
    }
    public Integer getIsShow() {
        return isShow;
    }
    public void setIsShow(Integer isShow) {
        this.isShow = isShow;
    }
}

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

@@ -1173,7 +1173,10 @@ public class BaseHospitalRequestMapping {
    
        //添加/修改文章
        public static final String saveArticle  = "/saveArticle";
    
        //修改文章是否展示首页
        public static final String updateIsShow  = "/updateIsShow";
        //审核/退回文章
        public static final String reviewArticle  = "/reviewArticle";
    
@@ -1399,6 +1402,7 @@ public class BaseHospitalRequestMapping {
        public static final String getMessage  = "/getMessage";
        public static final String getPoint  = "/getPoint";
        public static final String showDoctorMessage  = "/showDoctorMessage";
        public static final String updateIsShow  = "/updateIsShow";
    }
    /**

svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/service/channel/PrescriptionStatusUpdateService.java

@@ -489,6 +489,7 @@ public class PrescriptionStatusUpdateService {
                try {
                    data.put("name", wlyyOutpatientDO.getPatientName());
                    data.put("age", IdCardUtil.getAgeForIdcard(wlyyOutpatientDO.getIdcard()));
                    data.put("consumerName",wlyyOutpatientDO.getConsumerName());
                    data.put("gender", IdCardUtil.getSexForIdcard(wlyyOutpatientDO.getIdcard()));
                    data.put("question", wlyyOutpatientDO.getIcd10Name());
                    String msg = "";
@@ -600,6 +601,7 @@ public class PrescriptionStatusUpdateService {
                        messageDO.setReceiverName(wlyyOutpatientDO.getPatientName());
                        net.sf.json.JSONObject data = new net.sf.json.JSONObject();
                        data.put("name", wlyyOutpatientDO.getPatientName());
                        data.put("consumerName",wlyyOutpatientDO.getConsumerName());
                        data.put("age", IdCardUtil.getAgeForIdcard(wlyyOutpatientDO.getIdcard()));
                        data.put("gender", IdCardUtil.getSexForIdcard(wlyyOutpatientDO.getIdcard()));
                        data.put("question", wlyyOutpatientDO.getIcd10Name());
@@ -796,6 +798,7 @@ public class PrescriptionStatusUpdateService {
                        messageDO.setReceiverName(wlyyOutpatientDO.getPatientName());
                        net.sf.json.JSONObject data = new net.sf.json.JSONObject();
                        data.put("name", wlyyOutpatientDO.getPatientName());
                        data.put("consumerName",wlyyOutpatientDO.getConsumerName());
                        data.put("age", IdCardUtil.getAgeForIdcard(wlyyOutpatientDO.getIdcard()));
                        data.put("gender", IdCardUtil.getSexForIdcard(wlyyOutpatientDO.getIdcard()));
                        data.put("question", wlyyOutpatientDO.getIcd10Name());

svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/service/channel/TimeoutOverDueService.java

@@ -156,6 +156,7 @@ public class TimeoutOverDueService {
                                messageDO.setReceiverName(wlyyOutpatientDO.getPatientName());
                                net.sf.json.JSONObject data = new net.sf.json.JSONObject();
                                data.put("name", wlyyOutpatientDO.getPatientName());
                                data.put("consumerName",wlyyOutpatientDO.getConsumerName());
                                data.put("age", IdCardUtil.getAgeForIdcard(wlyyOutpatientDO.getIdcard()));
                                data.put("gender", IdCardUtil.getSexForIdcard(wlyyOutpatientDO.getIdcard()));
                                data.put("question", wlyyOutpatientDO.getIcd10Name());

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

@@ -169,6 +169,22 @@ public class ArticleEndpoint extends EnvelopRestEndpoint {
			return failedException(e);
		}
	}
	@PostMapping (value = BaseHospitalRequestMapping.KnowledgeArticle.updateIsShow)
	@ApiOperation(value = "修改文章是否展示首页")
	public Envelop updateIsShow(
			@ApiParam(name = "id", value = "id", required = true)
			@RequestParam String id,
			@ApiParam(name = "isShow", value = "isShow", required = true)
			@RequestParam Integer isShow)throws Exception {
		try {
			knowledgeArticleService.updateIsShow(id,isShow);
			return success("操作成功");
		}catch (Exception e){
			return failedException(e);
		}
	}
	
	@PostMapping (value = BaseHospitalRequestMapping.KnowledgeArticle.reviewArticle)
	@ApiOperation(value = "审核/退回文章")

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

@@ -91,13 +91,30 @@ public class BaseUserMsgController extends EnvelopRestEndpoint {
                                           @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){
                                   @RequestParam(value = "pageSize", required = true,defaultValue = "10")Integer pageSize,
                               @ApiParam(name = "isShow", value = "是否显示（1显示0不显示）", required = false)
                                   @RequestParam(value = "isShow", required = false)Integer isShow){
        try {
            return baseUserMsgService.getMessage(doctor,showAll,showAllType,beginTime,endTime,patient,page,pageSize);
            return baseUserMsgService.getMessage(doctor,showAll,showAllType,beginTime,endTime,patient,page,pageSize,isShow);
        }catch (Exception e){
            return failedException(e);
        }
    }
    @ApiOperation("修改留言是否展示")
    @PostMapping(value= BaseHospitalRequestMapping.UserMessage.updateIsShow)
    public Envelop updateIsShow(@ApiParam(name = "id", value = "id", required = false)
                               @RequestParam(value = "id", required = false)String id,
                               @ApiParam(name = "isShow", value = "isShow", required = false)
                               @RequestParam(value = "isShow", required = false)Integer isShow){
        try {
            return success(baseUserMsgService.updateIsShow(id,isShow));
        }catch (Exception e){
            return failedException(e);
        }
    }
    @ApiOperation("医生评论展示")
    @PostMapping(value= BaseHospitalRequestMapping.UserMessage.getSingleMessage)
    public Envelop getSingleMessage(@ApiParam(name = "id", value = "id", required = false)

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

@@ -99,6 +99,9 @@ public class SystemMessageController extends EnvelopRestEndpoint {
                filters=filters+";del=1";
            }
            List<SystemMessageDO> list  = systemMessageService.search(fields,filters,sorts,page,pageSize);
            for (SystemMessageDO systemMessageDO:list){
            }
            int count = (int) systemMessageService.getCount(filters);
            return success(list, count, page, pageSize, SystemMessageDO.class);
        }catch (Exception e){

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

@@ -1651,10 +1651,12 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
                               @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){
                               @RequestParam(value = "pageSize", required = true,defaultValue = "10")Integer pageSize,
                               @ApiParam(name = "isShow", value = "是否显示（1显示0不显示）", required = false)
                                   @RequestParam(value = "isShow", required = false)Integer isShow){
        try {
            return baseUserMsgService.getMessage(doctor,showAll,showAllType,beginTime,endTime,patient,page,pageSize);
            return baseUserMsgService.getMessage(doctor,showAll,showAllType,beginTime,endTime,patient,page,pageSize,isShow);
        } catch (Exception e) {
            return failedException(e);
        }

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

@@ -118,6 +118,22 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDO,
			return  one;
		}
	}
	/**
	 * 更新/保存健康文章
	 * @param jsonData
	 * @return
	 * @throws Exception
	 */
	public KnowledgeArticleDO updateIsShow(String id,Integer isShow) throws  Exception {
		KnowledgeArticleDO one = knowledgeArticleDao.findOne(id);
		one.setIsShow(isShow);
		one.setUpdateTime(new Date());
		knowledgeArticleDao.save(one);
		return  one;
	}
	
	//审核/退回文章
	public KnowledgeArticleDO reviewArticle(String articleId,Integer status,String reason) throws Exception{