Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
A
Aidea
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sa_aidea
Aidea
Commits
9b4b5ee2
Commit
9b4b5ee2
authored
Nov 10, 2020
by
谢希宇
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Aidea product update by Strive Date 2020-11-09
parent
d6cbe6a0
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
14 deletions
+15
-14
ConsultSheetMapper.xml
...n/java/com/cftech/consultsheet/dao/ConsultSheetMapper.xml
+2
-2
ConsultSheet.java
...main/java/com/cftech/consultsheet/model/ConsultSheet.java
+2
-2
ConsultSheetServiceImpl.java
...ch/consultsheet/service/impl/ConsultSheetServiceImpl.java
+8
-8
ConsultSheetMapper.xml
...lasses/com/cftech/consultsheet/dao/ConsultSheetMapper.xml
+3
-2
No files found.
aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/dao/ConsultSheetMapper.xml
View file @
9b4b5ee2
...
...
@@ -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 !=''"
>
...
...
aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/model/ConsultSheet.java
View file @
9b4b5ee2
...
...
@@ -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
;
...
...
aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/service/impl/ConsultSheetServiceImpl.java
View file @
9b4b5ee2
...
...
@@ -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
(
"err
e
rNo"
,
0
);
retObj
.
put
(
"err
e
rMsg"
,
"咨询单提交成功,请等待药师审核"
);
retObj
.
put
(
"err
o
rNo"
,
0
);
retObj
.
put
(
"err
o
rMsg"
,
"咨询单提交成功,请等待药师审核"
);
}
else
{
retObj
.
put
(
"errrNo"
,
1
);
retObj
.
put
(
"err
o
rNo"
,
1
);
retObj
.
put
(
"errorMsg"
,
"咨询单保存失败"
);
}
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
retObj
.
put
(
"errrNo"
,
1
);
retObj
.
put
(
"err
o
rNo"
,
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
(
"err
e
rNo"
,
0
);
rtnJson
.
put
(
"err
o
rNo"
,
0
);
rtnJson
.
put
(
"data"
,
consultSheets
);
}
else
{
rtnJson
.
put
(
"err
e
rNo"
,
1
);
rtnJson
.
put
(
"err
o
rNo"
,
1
);
rtnJson
.
put
(
"errorMsg"
,
"搜索失败"
);
}
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
rtnJson
.
put
(
"errrNo"
,
1
);
rtnJson
.
put
(
"errrMsg"
,
"咨询单列表"
+
e
.
getMessage
());
rtnJson
.
put
(
"err
o
rNo"
,
1
);
rtnJson
.
put
(
"err
o
rMsg"
,
"咨询单列表"
+
e
.
getMessage
());
}
return
rtnJson
;
}
...
...
aidea-modules/consult-module/target/classes/com/cftech/consultsheet/dao/ConsultSheetMapper.xml
View file @
9b4b5ee2
...
...
@@ -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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment