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

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

@@ -15,6 +15,8 @@ public interface SurveyUserAnswerDao extends PagingAndSortingRepository<WlyySurv
    List<WlyySurveyUserAnswerDO> findBySurveyTempCodeAndPatient(String surveyTempCode,String patient);
    List<WlyySurveyUserAnswerDO> findBySurverUserId(String surverUserId);
    List<WlyySurveyUserAnswerDO> findByTempQuestionCode(String tempQuestionCode);
    List<WlyySurveyUserAnswerDO> findBytempOptionCode(String tempOptionCode);

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

@@ -13,6 +13,7 @@ import com.yihu.jw.util.common.IdCardUtil;
import com.yihu.jw.util.common.PercentageUtil;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.utils.EntityUtils;
import com.yihu.jw.utils.StringUtil;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -537,10 +538,11 @@ public class SurveyService extends BaseJpaService<WlyySurveyQuestionDO, SurveyQu
    public Boolean saveSurveyAnswer(String suJson,String suaJsons)throws Exception{
        WlyySurveyUserDO surveyUserDO = objectMapper.readValue(suJson,WlyySurveyUserDO.class);
        surveyUserDao.save(surveyUserDO);
        surveyUserDO.setDate(DateUtil.dateToStr(new Date(),"yyyy-MM-dd"));
        surveyUserDO = surveyUserDao.save(surveyUserDO);
        //删除问题答案
        List<WlyySurveyUserAnswerDO> dels = surveyUserAnswerDao.findBySurveyTempCodeAndPatient(surveyUserDO.getSurveyTempCode(),surveyUserDO.getPatient());
        List<WlyySurveyUserAnswerDO> dels = surveyUserAnswerDao.findBySurverUserId(surveyUserDO.getId());
        if(dels!=null&&dels.size()>0){
            surveyUserAnswerDao.delete(dels);
        }
@@ -548,13 +550,25 @@ public class SurveyService extends BaseJpaService<WlyySurveyQuestionDO, SurveyQu
        //保存答案
        if(StringUtils.isNotBlank(suaJsons)){
            List<WlyySurveyUserAnswerDO> answerDOs = EntityUtils.jsonToList(suaJsons,WlyySurveyUserAnswerDO.class);
            for(WlyySurveyUserAnswerDO answerDO : answerDOs){
                answerDO.setSurverUserId(surveyUserDO.getId());
            }
            surveyUserAnswerDao.save(answerDOs);
        }
        return true;
    }
    public List<WlyySurveyUserAnswerDO> findAnswerBySurveyTempCode(String patient,String tempId){
        List<WlyySurveyUserAnswerDO> list = surveyUserAnswerDao.findBySurveyTempCodeAndPatient(tempId,patient);
    public List<WlyySurveyUserAnswerDO> findAnswerBySurveyTempCode(String surverUserId,String patient,String tempId){
        List<WlyySurveyUserAnswerDO> list = null;
        if(StringUtils.isNotBlank(surverUserId)){
            list = surveyUserAnswerDao.findBySurverUserId(surverUserId);
        }else{
            List<WlyySurveyUserDO> surveys = surveyUserDao.findBySurvey(tempId,patient, DateUtil.strToDate(DateUtil.dateToStr(new Date(),"yyyy-MM-dd")));
            if(surveys!=null&&surveys.size()>0){
                WlyySurveyUserDO wlyySurveyUserDO = surveys.get(0);
                list = surveyUserAnswerDao.findBySurverUserId(wlyySurveyUserDO.getId());
            }
        }
        return list;
    }

business/base-service/src/main/java/com/yihu/jw/internet/service/InternetService.java

@@ -397,7 +397,7 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
            Boolean errorFlag = false;
            try{
                String[] dept = depToSubject(info.get("dept").toString());
                jb.put("id", orgCode + info.get("id"));
                jb.put("id", orgCode + (String)info.get("id"));
                jb.put("cd_org", orgCode);
                jb.put("cd_area", orgArea);
                jb.put("cd_orgSub", orgSub);
@@ -417,7 +417,7 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
                jb.put("crt_date",DateUtil.dateToStrLong(DateUtil.getNow()));
            }catch (Exception e){
                errorFlag = true;
                saveErrorLog(upid,"5",info.get("id").toString(),res,1);
                saveErrorLog(upid,"5",(String)info.get("id"),"网上预约挂号数据格式错误",1);
                dataError++;
                logger.error(e.toString());
            }
@@ -431,7 +431,7 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
                if("200".equals(resJson.get("msg").toString())){
                    success++;
                }else{
                    saveErrorLog(upid,"5",info.get("id").toString(),res,2);
                    saveErrorLog(upid,"5",(String)info.get("id"),res,2);
                    error++;
                }
            }
@@ -470,7 +470,8 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
                "WHERE " +
                " i.create_time >='"+startDate+"' " +
                " and i.create_time <='"+endDate+"'" +
                " and i.dept is not null";
                " and i.dept is not null" +
                " and o.register_date is not null";
        if(StringUtils.isNotBlank(keyId)){
            sql +=" and i.id = '"+keyId+"'";
        }
@@ -484,16 +485,16 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
                try {
                    String[] dept = depToSubject(ins.get("dept").toString());
                    String docInterId = achNsDoctorRecord(ins.get("doctor").toString());
                    jb.put("id",orgCode + ins.get("id").toString());
                    jb.put("id",orgCode + (String)ins.get("id"));
                    jb.put("cd_org", orgCode);
                    jb.put("cd_area", orgArea);
                    jb.put("cd_orgSub", orgSub);
                    jb.put("app_time",DateUtil.dateToStr(new Date((Long)ins.get("register_date")),"YYYY-MM-DD HH:mm:SS"));
                    jb.put("app_time",DateUtil.dateToStr((Date)ins.get("register_date"),"yyyy-MM-dd HH:mm:ss"));
                    jb.put("app_dep_code", dept[0].toString());
                    jb.put("app_class_code", ins.get("code"));
                    jb.put("id_doctor", docInterId);
                    jb.put("fg_handle", "1");
                    jb.put("handle_time", DateUtil.dateToStr(new Date((Long)ins.get("create_time")),"YYYY-MM-DD HH:mm:SS"));
                    jb.put("handle_time", DateUtil.dateToStr((Date)ins.get("create_time"),"YYYY-MM-DD HH:mm:SS"));
                    jb.put("pt_name",ins.get("name").toString());
                    String sex = IdCardUtil.getSexForIdcard_new(ins.get("idcard").toString());
                    jb.put("ge_code", sex=="3"?"9":sex);
@@ -503,7 +504,7 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
                    jb.put("crt_date",DateUtil.dateToStrLong(DateUtil.getNow()));
                }catch (Exception e){
                    errorFlag = true;
                    saveErrorLog(upid,"6",ins.get("id ").toString(),res,1);
                    saveErrorLog(upid,"6",(String)ins.get("id"),"在线医技预约格式错误",1);
                    dataError++;
                    logger.error(e.toString());
                }
@@ -517,7 +518,7 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
                    if("200".equals(resJson.get("msg").toString())){
                        success++;
                    }else{
                        saveErrorLog(upid,"6",ins.get("id ").toString(),res,2);
                        saveErrorLog(upid,"6",(String)ins.get("id "),res,2);
                        error++;
                    }
                }
@@ -584,7 +585,7 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
                String[] dept = depToSubject(info.get("dept_code").toString());
                jb.put("id",orgCode + info.get("id"));
                jb.put("id",orgCode + (String)info.get("id"));
                jb.put("id_doctor",interId == null ? "0":interId);
                jb.put("organ_code",orgCode);
                jb.put("organ_name", orgName);
@@ -597,7 +598,7 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
                jb.put("crt_date", DateUtil.dateToStrLong(DateUtil.getNow()));
            }catch (Exception e){
                errorFlag = true;
                saveErrorLog(upid,"7",info.get("id").toString(),res,2);
                saveErrorLog(upid,"7",(String)info.get("id"),"医生评价信息格式错误",2);
                dataError++;
                logger.error(e.toString());
            }
@@ -666,7 +667,7 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
                // 获取监管平台唯一标识
                String visitDocCode = achNsDoctorRecord(info.get("docId").toString());
                jb.put("id_online_ask", info.get("id"));
                jb.put("id_online_ask", (String)info.get("id"));
                jb.put("net_service_code", "1");
                jb.put("med_class_code", "1"/*info.get("type")*/);
                jb.put("med_pop_code", "1");
@@ -698,7 +699,7 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
                jb.put("crt_time", DateUtil.dateToStrLong(DateUtil.getNow()));
            }catch (Exception e){
                errorFlag = true;
                saveErrorLog(upid,"8",info.get("id").toString(),res,2);
                saveErrorLog(upid,"8",(String)info.get("id"),"网络咨询服务信息格式错误",2);
                dataError++;
                logger.error(e.toString());
            }
@@ -813,7 +814,7 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
                jb.put("crt_time", DateUtil.dateToStrLong(DateUtil.getNow()));
            }catch (Exception e){
                errorFlag = true;
                saveErrorLog(upid,"9",info.get("id").toString(),res,1);
                saveErrorLog(upid,"9",(String)info.get("id"),"网络诊疗服务信息格式错误",1);
                dataError++;
                logger.error(e.toString());
            }
@@ -827,7 +828,7 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
                if("200".equals(resJson.get("msg").toString())){
                    success++;
                }else{
                    saveErrorLog(upid,"9",info.get("id").toString(),res,2);
                    saveErrorLog(upid,"9",(String)info.get("id"),res,2);
                    error++;
                }
            }
@@ -881,7 +882,7 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
                // 获取监管平台唯一标识
                String visitDocCode = achNsDoctorRecord(info.get("docIdcard").toString());
                jb.put("id_prescription", orgCode + info.get("id"));
                jb.put("id_prescription", orgCode + (String)info.get("id"));
                jb.put("pres_no",info.get("real_order")== null?"0":info.get("real_order"));
                jb.put("pres_class_code", "1");
                jb.put("pres_class_name", "西药");
@@ -929,7 +930,7 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
                jb.put("pres_photos", "");
            }catch (Exception e){
                errorFlag = true;
                saveErrorLog(upid,"10",info.get("id").toString(),res,1);
                saveErrorLog(upid,"10",(String)info.get("id"),"电子处方表格式错误",1);
                dataError++;
                logger.error(e.toString());
            }
@@ -943,7 +944,7 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
                if("200".equals(resJson.get("msg").toString())){
                    success++;
                }else{
                    saveErrorLog(upid,"10",info.get("id").toString(),res,2);
                    saveErrorLog(upid,"10",(String)info.get("id"),res,2);
                    error++;
                }
            }
@@ -990,7 +991,7 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
            JSONObject jb = new JSONObject();
            Boolean errorFlag = false;
            try {
                jb.put("id_prescription_drug",orgCode + info.get("id"));
                jb.put("id_prescription_drug",orgCode + (String)info.get("id"));
                jb.put("pres_no", info.get("prescription_id") == null? "0": info.get("prescription_id"));
                jb.put("org_code",orgCode);
                jb.put("appr_drug_code", info.get("drug_no") == null? "0": info.get("drug_no"));
@@ -1012,7 +1013,7 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
                jb.put("dec_meth_name", "");
            }catch (Exception e){
                errorFlag = true;
                saveErrorLog(upid,"11",info.get("id").toString(),res,1);
                saveErrorLog(upid,"11",(String)info.get("id"),res,1);
                dataError++;
                logger.error(e.toString());
            }
@@ -1026,7 +1027,7 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
                if("200".equals(resJson.get("msg").toString())){
                    success++;
                }else{
                    saveErrorLog(upid,"11",info.get("id").toString(),res,2);
                    saveErrorLog(upid,"11",(String)info.get("id"),res,2);
                    error++;
                }
            }
@@ -1248,6 +1249,7 @@ public class InternetService extends BaseJpaService<InternetUpErrorLogDO, IntUpE
        internetUpErrorLogDO.setErrorType(errorType);
        internetUpErrorLogService.save(internetUpErrorLogDO);
    }
    public void saveUpLog(String upid,String code,Date startDate,Date endDate,Integer suc,Integer err,Integer dataErr,String remark){
        InternetUpLogDO internetUpLogDO = new InternetUpLogDO();

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/survey/WlyySurveyUserAnswerDO.java

@@ -14,6 +14,7 @@ import java.util.Date;
@Table(name = "wlyy_survey_user_answer")
public class WlyySurveyUserAnswerDO extends UuidIdentityEntity {
    private String surverUserId;//答题批次号
    private String surveyTempCode;//问卷模板编码',
    private String tempQuestionCode;//问答题题目编码',
    private Integer questionType;//
@@ -25,6 +26,14 @@ public class WlyySurveyUserAnswerDO extends UuidIdentityEntity {
    private Integer score;//得分',
    private Date createTime;//答案填写时间',
    public String getSurverUserId() {
        return surverUserId;
    }
    public void setSurverUserId(String surverUserId) {
        this.surverUserId = surverUserId;
    }
    public String getSurveyTempCode() {
        return surveyTempCode;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/survey/WlyySurveyUserDO.java

@@ -23,6 +23,7 @@ public class WlyySurveyUserDO extends UuidIdentityEntity {
    private String doctor;  //医生
    private String doctorName;//医生名称
    private Integer status;//是否已答（0未答 1已答 2放弃）',
    private String date; //答题时间
    private Date endTime;//完成时间（放弃时间）',
    private Date createTime;//调查时间(居民接受时间)',
@@ -115,4 +116,12 @@ public class WlyySurveyUserDO extends UuidIdentityEntity {
    public void setDoctorName(String doctorName) {
        this.doctorName = doctorName;
    }
    public String getDate() {
        return date;
    }
    public void setDate(String date) {
        this.date = date;
    }
}

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

@@ -179,8 +179,10 @@ public class SurveyEndpoint extends EnvelopRestEndpoint {
    public ListEnvelop findAnswerBySurveyTempCode(@ApiParam(name = "patient", value = "居民ID")
                                                  @RequestParam(value = "patient",required = true)String patient,
                                                  @ApiParam(name = "tempId", value = "模板id")
                                                  @RequestParam(value = "tempId",required = true)String tempId)throws Exception {
        return success(surveyService.findAnswerBySurveyTempCode(patient,tempId));
                                                  @RequestParam(value = "tempId",required = true)String tempId,
                                                  @ApiParam(name = "surverUserId", value = "答题批次号")
                                                  @RequestParam(value = "surverUserId",required = false)String surverUserId)throws Exception {
        return success(surveyService.findAnswerBySurveyTempCode(surverUserId,patient,tempId));
    }
    @GetMapping(value = BaseHospitalRequestMapping.WlyySurvey.findSurveyTemplateResult)