Merge branch 'master' of gitee.com:ccsens_s/ccsenscloud

ht/src/main/java/com/ccsens/ht/api/DoctorController.java

@@ -55,7 +55,7 @@ public class DoctorController {
             @ApiImplicitParam(name = "json", value = "医生查询条件", required = true)
     })
     @RequestMapping(value = "/queryDoctors", method = RequestMethod.POST)
-    public JsonResponse queryDoctors(@RequestBody @ApiParam @Valid QueryDto<DoctorDto.Query> params) {
+    public JsonResponse<PageInfo<DoctorVo.Query>> queryDoctors(@RequestBody @ApiParam @Valid QueryDto<DoctorDto.Query> params) {
         log.info("资格认证列表：{}", params);
         PageInfo<DoctorVo.Query> dtos = doctorService.queryDoctors(params.getParam(), params.getUserId());
         return  JsonResponse.newInstance().ok(CodeEnum.SUCCESS, dtos);

ht/src/main/java/com/ccsens/ht/api/PatientController.java

@@ -51,7 +51,7 @@ public class PatientController {
             @ApiImplicitParam(name = "json", value = "病友基础信息", required = true)
     })
     @RequestMapping(value="/queryPatient", method = RequestMethod.POST)
-    public JsonResponse query(@RequestBody @ApiParam @Valid QueryDto<PatientDto.Query> params) {
+    public JsonResponse<PatientVo.Query> query(@RequestBody @ApiParam @Valid QueryDto<PatientDto.Query> params) {
         log.info("病友信息查询：{}", params);
         PatientDto.Query patient = params.getParam();
 
@@ -75,7 +75,7 @@ public class PatientController {
             @ApiImplicitParam(name = "json", value = "病友基础信息", required = true)
     })
     @RequestMapping(value="/editPatient", method = RequestMethod.POST)
-    public JsonResponse edit(@RequestBody @ApiParam @Valid QueryDto<PatientDto.Edit>params) {
+    public JsonResponse<PatientVo.Edit> edit(@RequestBody @ApiParam @Valid QueryDto<PatientDto.Edit>params) {
         log.info("病友信息编辑：{}", params);
         PatientDto.Edit patient = params.getParam();
         if(StringUtils.isEmpty(patient.getMobile()) || StringUtils.isEmpty(patient.getName())) {

ht/src/main/java/com/ccsens/ht/api/PatientReportController.java

@@ -41,16 +41,16 @@ public class PatientReportController {
             @ApiImplicitParam(name = "json", value = "报告单信息", required = true)
     })
     @RequestMapping(value="/generatePatientReport", method = RequestMethod.POST)
-    public JsonResponse generate(@RequestBody @ApiParam @Valid QueryDto<PatientReportDto.Generate> dto){
+    public JsonResponse<PatientReportVo.Generate> generate(@RequestBody @ApiParam @Valid QueryDto<PatientReportDto.Generate> dto){
         log.info("生成报告单请求参数：{}", dto);
         PatientReportDto.Generate patientReport = dto.getParam();
         if (patientReport == null || patientReport.getPatientId() == null || patientReport.getPatientId() == 0) {
             return JsonResponse.newInstance().ok(CodeEnum.PARAM_NULL);
         }
         //TODO 判断病友是否和当前医院绑定，未绑定，进行绑定
-        JsonResponse response = patientReportService.generatePatientReport(patientReport, dto.getUserId());
+        JsonResponse<PatientReportVo.Generate> response = patientReportService.generatePatientReport(patientReport, dto.getUserId());
         log.info("生成病友报告单返回：{}", response);
-        return JsonResponse.newInstance().ok(response);
+        return response;
     }
     @MustLogin
     @DoctorAudit
@@ -74,7 +74,7 @@ public class PatientReportController {
             @ApiImplicitParam(name = "json", value = "编辑报告单信息", required = true)
     })
     @RequestMapping(value="/queryReports", method = RequestMethod.POST)
-    public JsonResponse queryReports(@RequestBody @ApiParam @Valid QueryDto<PatientReportDto.QueryReports> param){
+    public JsonResponse<PageInfo<PatientReportVo.ReportName>> queryReports(@RequestBody @ApiParam @Valid QueryDto<PatientReportDto.QueryReports> param){
 
         //编辑报告单信息
         log.info("查询报告单列表：{}", param);
@@ -88,7 +88,7 @@ public class PatientReportController {
             @ApiImplicitParam(name = "json", value = "查询报告单详情", required = true)
     })
     @RequestMapping(value="/queryReportDetail", method = RequestMethod.POST)
-    public JsonResponse queryReportDetail(@RequestBody @ApiParam @Valid QueryDto<PatientReportDto.QueryDetail> param){
+    public JsonResponse<PatientReportVo.ReprotDetail> queryReportDetail(@RequestBody @ApiParam @Valid QueryDto<PatientReportDto.QueryDetail> param){
         //查询报告单信息
         log.info("查询报告单详情：{}", param);
         PatientReportVo.ReprotDetail detail = patientReportService.queryReportDetail(param.getParam(), param.getUserId());
@@ -102,7 +102,7 @@ public class PatientReportController {
             @ApiImplicitParam(name = "json", value = "报告单ID", required = true)
     })
     @RequestMapping(value="/queryAuthority", method = RequestMethod.POST)
-    public JsonResponse queryAuthority(@RequestBody @ApiParam @Valid QueryDto<PatientReportDto.Authority> param){
+    public JsonResponse<PatientReportVo.Authority> queryAuthority(@RequestBody @ApiParam @Valid QueryDto<PatientReportDto.Authority> param){
         //查询报告单信息
         log.info("查询医生对报告单的权限：{}", param);
         PatientReportVo.Authority authority = patientReportService.queryReportAuthority(param.getParam(), param.getUserId());

ht/src/main/java/com/ccsens/ht/api/PositionController.java

@@ -36,7 +36,7 @@ public class PositionController {
             @ApiImplicitParam(name = "json", value = "医院/部门/职务查询", required = true)
     })
     @RequestMapping(value="/queryPosition", method = RequestMethod.POST)
-    public JsonResponse queryPosition(@RequestBody @ApiParam @Valid QueryDto<PositionDto.Position> params){
+    public JsonResponse<List<PositionVo.Position>> queryPosition(@RequestBody @ApiParam @Valid QueryDto<PositionDto.Position> params){
         log.info("查询职务：{}", params);
         List<PositionVo.Position> positions = positionService.queryPosition(params.getParam(), params.getUserId());
         return JsonResponse.newInstance().ok(positions);
@@ -48,7 +48,7 @@ public class PositionController {
             @ApiImplicitParam(name = "json", value = "职称查询", required = true)
     })
     @RequestMapping(value="/queryTitle", method = RequestMethod.POST)
-    public JsonResponse queryTitle(){
+    public JsonResponse<List<PositionVo.Title>> queryTitle(){
         log.info("查询职称");
         List<PositionVo.Title> titles = positionService.queryTitles();
         return JsonResponse.newInstance().ok(titles);

ht/src/main/java/com/ccsens/ht/api/QuestionController.java

@@ -41,7 +41,7 @@ public class QuestionController {
             @ApiImplicitParam(name = "json", value = "测评试题查询信息", required = true)
     })
     @RequestMapping(value="/queryQuestion", method = RequestMethod.POST)
-    public JsonResponse query(@RequestBody @ApiParam @Valid QueryDto<QuestionDto.Query> queryDto){
+    public JsonResponse<QuestionVo.Query> query(@RequestBody @ApiParam @Valid QueryDto<QuestionDto.Query> queryDto){
         log.info("查询试题：{}", queryDto);
         QuestionVo.Query query = questionService.queryQuestion(queryDto.getParam(), queryDto.getUserId());
         log.info("查询试题结果：{}", query);

ht/src/main/java/com/ccsens/ht/service/IPatientReportService.java

@@ -17,7 +17,7 @@ public interface IPatientReportService {
      *@Author: wuHuiJuan
      *@date: 2019/10/30 16:45
      */
-    JsonResponse generatePatientReport(PatientReportDto.Generate patientReport, Long userId);
+    JsonResponse<PatientReportVo.Generate> generatePatientReport(PatientReportDto.Generate patientReport, Long userId);
     /**
      * 编辑病人报告单其他信息（初步印象、临床诊断、床号）
      * @param patientReport

ht/src/main/java/com/ccsens/ht/service/PatientReportService.java

@@ -57,7 +57,7 @@ public class PatientReportService implements IPatientReportService {
     private HtPatientReportRecordMapper htPatientReportRecordMapper;
 
     @Override
-    public JsonResponse generatePatientReport(PatientReportDto.Generate generate, Long userId) {
+    public JsonResponse<PatientReportVo.Generate> generatePatientReport(PatientReportDto.Generate generate, Long userId) {
         log.info("生成报告单请求参数：userId:{}, patientReport:{}", userId, generate);
         //查询医生信息
         HtDoctorExample doctorExample = new HtDoctorExample();

ht/src/main/resources/mapper_dao/HtQuestionOptionDao.xml

@@ -42,8 +42,8 @@
 
   <select id="queryOption" resultMap="OptionMap">
     select t1.id, t1.type, t1.question_id, t1.name, t1.score, t1.display, if (t2.id is null, 0, 1) as choose , if(t2.type = 3, null, t2.answer) as answer
-    from t_ht_question_option t1 left join t_ht_patient_score t2 on t1.id = t2.option_id
+    from t_ht_question_option t1 left join t_ht_patient_score t2 on t1.id = t2.option_id and (t2.id is null or t2.patient_report_id = #{patientReportId,jdbcType=BIGINT})
-    where t1.question_id = #{questionId,jdbcType=BIGINT} and (t2.id is null or t2.patient_report_id = #{patientReportId,jdbcType=BIGINT})
+    where t1.question_id = #{questionId,jdbcType=BIGINT}
             and t1.is_del = 0
     group by t1.id
     order by t1.sort