问卷修改

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

@@ -254,7 +254,6 @@ public class BaseBannerService extends BaseJpaService<BaseBannerDO, BaseBannerDa
        }
        //获取的下一条banner
        //BaseBannerDO downPrevious = baseBannerDao.downBanner(sort);
        //交换sort值
        bannerDO.setSort(downPrevious.getSort());
        downPrevious.setSort(sort);

business/base-service/src/main/java/com/yihu/jw/hospital/survey/service/SurveyService.java

@@ -354,12 +354,22 @@ public class SurveyService extends BaseJpaService<WlyySurveyQuestionDO, SurveyQu
     * @param tempId
     * @return
     */
    public WlyySurveyTemplateVO findSurveyTemplateById(String tempId){
    public WlyySurveyTemplateVO findSurveyTemplateById(String tempId,String userCode ){
        WlyySurveyTemplateDO templateDO = surveyTemplateDao.findOne(tempId);
        WlyySurveyTemplateVO templateVO = convertToModel(templateDO,WlyySurveyTemplateVO.class);
        templateVO.setLabels(findSurveyTemplateLabel(tempId));
        templateVO.setInsplabels(findSurveyInspTemplateLabel(tempId));
        String templateCode = templateDO.getId();
        String sqlUsed = "select t.used as \"used\" from wlyy_knowledge_article_user t where t.relation_code = '"+templateCode +"'";
        if(StringUtils.isNotEmpty(userCode)){
            sqlUsed += " and t.user_code = '"+userCode+"'";
        }
        System.out.println(sqlUsed);
        List<Map<String,Object>> listUsed = hibenateUtils.createSQLQuery(sqlUsed);
        if (listUsed.size()>0){
            String used = null!=listUsed.get(0).get("used")?listUsed.get(0).get("used").toString():"0";
            templateVO.setUsed(Integer.valueOf(used));
        }
        List<WlyySurveyTemplateQuestionDO> tqDOs = surveyTemplateQuestionDao.findByTemplateCodeAndDelOrderBySortAsc(tempId,"1");
        if(tqDOs!=null&&tqDOs.size()>0){
            //设置问题

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;

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

@@ -105,8 +105,10 @@ public class SurveyEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = BaseHospitalRequestMapping.WlyySurvey.findSurveyTemplateById)
    @ApiOperation(value = "模板-获取模板详情（单条）")
    public ObjEnvelop findSurveyTemplateById(@ApiParam(name = "tempId", value = "模板ID")
                                             @RequestParam(value = "tempId",required = true) String tempId) throws Exception {
        return success(surveyService.findSurveyTemplateById(tempId));
                                             @RequestParam(value = "tempId",required = true) String tempId,
                                             @ApiParam(name = "userCode", value = "当前用户id")
                                             @RequestParam(value = "userCode",required = true) String userCode ) throws Exception {
        return success(surveyService.findSurveyTemplateById(tempId,userCode));
    }
    @PostMapping(value = BaseHospitalRequestMapping.WlyySurvey.saveSurveyTemplate)

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

@@ -249,9 +249,11 @@ public class BasePatientBusinessService extends BaseJpaService<BasePatientBusine
				if (list.size() > 0) {
					for (Map<String, Object> map : list) {
						List<WlyySurveyLabelInfoVO>  wlyySurveyLabelInfoVOS= surveyService.findSurveyTemplateLabel(null==map.get("id")?"":map.get("id").toString());
						String createTime = null == map.get("create_time") ? "" : map.get("create_time").toString();
						String createTime = null == map.get("createTime") ? "" : map.get("createTime").toString();
                        String updateTime = null == map.get("updateTime") ? "" : map.get("updateTime").toString();
						String creater = null == map.get("creater") ? "" : map.get("creater").toString();
						map.put("create_time", DateUtil.dateToStrLong(DateUtil.strToDateLong(createTime)));
                        map.put("update_time", DateUtil.dateToStrLong(DateUtil.strToDateLong(updateTime)));
						map.put("labels",wlyySurveyLabelInfoVOS);
						BaseDoctorDO doctorDO = doctorDao.findById(creater);
						if (null!=doctor){
@@ -282,9 +284,11 @@ public class BasePatientBusinessService extends BaseJpaService<BasePatientBusine
					for (Map<String, Object> map : list) {
						List<WlyySurveyLabelInfoVO>  wlyySurveyLabelInfoVOS= surveyService.findSurveyTemplateLabel(null==map.get("id")?"":map.get("id").toString());
						map.put("labels",wlyySurveyLabelInfoVOS);
						String createTime = null == map.get("create_time") ? "" : map.get("create_time").toString();
						String creater = null == map.get("creater") ? "" : map.get("creater").toString();
						map.put("create_time", DateUtil.dateToStrLong(DateUtil.strToDateLong(createTime)));
                        String createTime = null == map.get("createTime") ? "" : map.get("createTime").toString();
                        String updateTime = null == map.get("updateTime") ? "" : map.get("updateTime").toString();
                        map.put("create_time", DateUtil.dateToStrLong(DateUtil.strToDateLong(createTime)));
                        map.put("update_time", DateUtil.dateToStrLong(DateUtil.strToDateLong(updateTime)));
                        String creater = null == map.get("creater") ? "" : map.get("creater").toString();
						BaseDoctorDO doctorDO = doctorDao.findById(creater);
						if (null!=doctor){
							map.put("doctrName", doctorDO.getName());
@@ -318,9 +322,11 @@ public class BasePatientBusinessService extends BaseJpaService<BasePatientBusine
				for (Map<String, Object> map : list) {
					List<WlyySurveyLabelInfoVO>  wlyySurveyLabelInfoVOS= surveyService.findSurveyTemplateLabel(null==map.get("id")?"":map.get("id").toString());
					map.put("labels",wlyySurveyLabelInfoVOS);
					String createTime = null == map.get("create_time") ? "" : map.get("create_time").toString();
                    String createTime = null == map.get("createTime") ? "" : map.get("createTime").toString();
                    String updateTime = null == map.get("updateTime") ? "" : map.get("updateTime").toString();
                    map.put("create_time", DateUtil.dateToStrLong(DateUtil.strToDateLong(createTime)));
                    map.put("update_time", DateUtil.dateToStrLong(DateUtil.strToDateLong(updateTime)));
					String creater = null == map.get("creater") ? "" : map.get("creater").toString();
					map.put("create_time", DateUtil.dateToStrLong(DateUtil.strToDateLong(createTime)));
					BaseDoctorDO doctorDO = doctorDao.findById(creater);
					if (null!=doctor){
						map.put("doctrName", doctorDO.getName());