Commit 9b4b5ee2 authored by 谢希宇's avatar 谢希宇

Aidea product update by Strive Date 2020-11-09

parent d6cbe6a0
......@@ -206,10 +206,10 @@
and open_id = #{openid}
</if>
<if test="name!=null and name !=''">
AND CONCAT(consult_id ) LIKE '%${name}%'
and user_name like concat('%',#{name},'%')
</if>
<if test="id!=null">
and id = #{id}
and id = #{id}
</if>
ORDER BY create_time DESC
<if test="page!=null and pageSize !='' and pageSize!=null and page !=''">
......
......@@ -38,10 +38,10 @@ public class ConsultSheet extends UserSheet implements Serializable {
private String phone;
/* 疾病史 */
@ExportConfig(value = "疾病史", width = 100, showLevel = 1)
private String pastRecords;
private String pastRecords;//0:否 1:是
/* 过敏史 */
@ExportConfig(value = "过敏史", width = 100, showLevel = 1)
private String allergy;
private String allergy;//0:否 1:是
/* 病情描述 */
@ExportConfig(value = "病情描述", width = 100, showLevel = 1)
private String illness;
......
......@@ -103,15 +103,15 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im
consultSheet.setConsultId(codingruleUtils.getNumber(consultSheet.getAccountsId(), ConsultSheet.class.getName()));
if (consultSheetMapper.save(consultSheet) > 0) {
memberProcess(consultSheet.getOpenId(), consultSheet);
retObj.put("errerNo", 0);
retObj.put("errerMsg", "咨询单提交成功,请等待药师审核");
retObj.put("errorNo", 0);
retObj.put("errorMsg", "咨询单提交成功,请等待药师审核");
} else {
retObj.put("errrNo", 1);
retObj.put("errorNo", 1);
retObj.put("errorMsg", "咨询单保存失败");
}
} catch (Exception e) {
e.printStackTrace();
retObj.put("errrNo", 1);
retObj.put("errorNo", 1);
retObj.put("errorMsg", "提交咨询单" + e.getMessage());
}
return retObj;
......@@ -124,16 +124,16 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im
MpAccountsEntity mpAccountsAppid = mpAccountsService.getMpAccountsAppid(consultSheetDto.getAppId());
List<ConsultSheet> consultSheets = consultSheetMapper.consultSheetList(consultSheetDto);
if (consultSheets != null) {
rtnJson.put("errerNo", 0);
rtnJson.put("errorNo", 0);
rtnJson.put("data", consultSheets);
} else {
rtnJson.put("errerNo", 1);
rtnJson.put("errorNo", 1);
rtnJson.put("errorMsg", "搜索失败");
}
} catch (Exception e) {
e.printStackTrace();
rtnJson.put("errrNo", 1);
rtnJson.put("errrMsg", "咨询单列表" + e.getMessage());
rtnJson.put("errorNo", 1);
rtnJson.put("errorMsg", "咨询单列表" + e.getMessage());
}
return rtnJson;
}
......
......@@ -197,6 +197,7 @@
<if test="sort!=null">ORDER BY ${sort.param} ${sort.type}</if>
<if test="limit>0">limit #{offset},#{limit}</if>
</select>
<select id="consultSheetList" resultType="com.cftech.consultsheet.model.ConsultSheet">
SELECT
<include refid="sqlCol"/>
......@@ -206,10 +207,10 @@
and open_id = {openid}
</if>
<if test="name!=null and name !=''">
and user_name like concat('%',#{name},'%')
and user_name like concat('%',#{name},'%')
</if>
<if test="id!=null">
and id = #{id}
and id = #{id}
</if>
ORDER BY create_time
</select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment