修改bug

common/common-entity/src/main/java/com/yihu/mm/entity/questionnaire/MedicineAnswerLog.java

@@ -9,6 +9,8 @@ import java.util.Date;
/**
 * Created by Administrator on 2017/8/9.
 * 越人api文档都是给string类型....但是真正返回的是number....注意了..
 * 可能有很多字段,越人接口有返回,但是对单个接口不容易取值,暂时没有存储
 */
@Entity
@Table(name = "wlyy_medicine_anwser_log")
@@ -17,11 +19,14 @@ public class MedicineAnswerLog extends IdEntity {
    private String patientCode; //客户code
    private String tpId;    //试卷编号
    private String tpName; //试卷名称
    private Date createTime;    //创建时间
    private String pbType;  //问卷类型
    private String answer;    //居民答案
    private String pbId;//试题编号
    private Date createTime;    //创建时间
    private String problems;    //问题的集合
    private String ctId;//咨询编号
    private String question;//问题描述
    private String opti;//问题选项
    private String type;//选项
    public String getPatientCode() {
        return patientCode;
@@ -56,14 +61,6 @@ public class MedicineAnswerLog extends IdEntity {
        this.createTime = createTime;
    }
    public String getProblems() {
        return problems;
    }
    public void setProblems(String problems) {
        this.problems = problems;
    }
    public String getPbType() {
        return pbType;
    }
@@ -87,4 +84,36 @@ public class MedicineAnswerLog extends IdEntity {
    public void setCtId(String ctId) {
        this.ctId = ctId;
    }
    public String getAnswer() {
        return answer;
    }
    public void setAnswer(String answer) {
        this.answer = answer;
    }
    public String getQuestion() {
        return question;
    }
    public void setQuestion(String question) {
        this.question = question;
    }
    public String getOpti() {
        return opti;
    }
    public void setOpti(String opti) {
        this.opti = opti;
    }
    public String getType() {
        return type;
    }
    public void setType(String type) {
        this.type = type;
    }
}

patient-co-customization/patient-co-modern-medicine/src/main/java/com/yihu/mm/controller/medicine/PhysicalExaminationController.java

@@ -103,12 +103,28 @@ public class PhysicalExaminationController extends BaseController {
        String _pb_id = recordset.get("pb_id").toString();//越人api问题,  我们数据库保存的居民答案的pb_id是这边返回下一题的pb_id
        //查找居民是否已经答过该试题
        MedicineAnswerLog answer = medicineAnswerLogService.findAnswer(patientCode, examCode, _pb_id,ct_id);
        String answerStr="";
        if(answer!=null){
            answerStr = answer.getProblems().replace("\"","\\\"");
        MedicineAnswerLog medicineAnswerLog = medicineAnswerLogService.findAnswer(patientCode, examCode, _pb_id,ct_id);
        String answer="";
        if(medicineAnswerLog!=null){
            answer = medicineAnswerLog.getAnswer().replace("\"","\\\"");
        }else{
            medicineAnswerLog = new MedicineAnswerLog();
            medicineAnswerLog.setPatientCode(patientCode);
            medicineAnswerLog.setTpId(examCode);
            medicineAnswerLog.setPbId(_pb_id);
            medicineAnswerLog.setCtId(ct_id);
            medicineAnswerLog.setCreateTime(new Date());
        }
        jsonQuestion.put("answer",answerStr);
        //获取题目 ,选项, 题目类型 ,并重新保存    --->>防止题目选择不同的答案,下个问题也跟着不一样
        String tb_title =  recordset.getString("tb_title");   //题目
        String option = recordset.getString("pb_alternative");//备选答案
        String type = recordset.get("i_multiselect").toString();//单选多选
        medicineAnswerLog.setType(type);
        medicineAnswerLog.setQuestion(tb_title);
        medicineAnswerLog.setOpti(option);
        medicineAnswerLogService.save(medicineAnswerLog);
        jsonQuestion.put("answer",answer);
        return jsonQuestion.toString();
    }
@@ -127,17 +143,8 @@ public class PhysicalExaminationController extends BaseController {
        //将答案保存/更新到自己数据库
        MedicineAnswerLog answer = medicineAnswerLogService.findAnswer(patientCode, examCode, pb_id, ct_id);
        if(answer==null){//新增
            answer = new MedicineAnswerLog();
            answer.setCreateTime(new Date());
            answer.setPatientCode(patientCode);
            answer.setPbId(pb_id);
            answer.setTpId(examCode);
            answer.setTpName(tpName);
            answer.setCtId(ct_id);
        }
        answer.setPbType(String.valueOf(type));
        answer.setProblems(dc_answer);
        answer.setType(String.valueOf(type));
        answer.setAnswer(dc_answer);
        medicineAnswerLogService.save(answer);
        return result;
    }

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/entity/Doctor.java

@@ -362,6 +362,9 @@ public class Doctor extends IdEntity {
    @Transient
    public String getLevelName() {
    	if(null==level){
			return "";
		}
		// 类型：1专科医生，2全科医生，3健康管理师
		if(1==level){
			levelName = "专科医生";