Merge branch 'dev' of chenweida/patient-co-management into dev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/service/ServiceItemDao.java

@@ -13,4 +13,7 @@ import java.util.List;
public interface ServiceItemDao extends PagingAndSortingRepository<ServiceItem, Long>, JpaSpecificationExecutor<ServiceItem> {
    @Query(" from ServiceItem where serviceCode=?1 and del=1")
    List<ServiceItem> findByServiceCode(String serviceCode);
    @Query(" from ServiceItem where code=?1")
    ServiceItem findByItemCode(String itemCode);
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/SignFamilyServiceService.java

@@ -160,7 +160,12 @@ public class SignFamilyServiceService {
     */
    public List<ServiceItem> getPatientServiceItem(String patient, String serviceCode) throws Exception {
        StringBuffer sql = new StringBuffer(" SELECT " +
                "   s.* " +
                "   s.code," +
                "   s.name," +
                "   s.sub_name, " +
                "   s.image, " +
                "   s.type, " +
                "   s.mobile " +
                " FROM " +
                "   wlyy_service_item s, " +
                "   wlyy_sign_family_service_item si " +
@@ -344,4 +349,7 @@ public class SignFamilyServiceService {
    }
    public ServiceItem getItemByItemCode(String itemCode) {
        return serviceItemDao.findByItemCode(itemCode);
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/sign/PatientSignFamilyServiceController.java

@@ -48,4 +48,18 @@ public class PatientSignFamilyServiceController extends BaseController {
            return error(-1, e.getMessage());
        }
    }
    @RequestMapping(value = "/getItemByItemCode", method = RequestMethod.GET)
    @ApiOperation("根据ItemCode获取服务详情")
    public String getItemByItemCode(
            @RequestParam(required = true, value = "itemCode") @ApiParam(required = true, value = "itemCode", name = "itemCode") String itemCode
    ) {
        try {
            ServiceItem serviceItems = signFamilyServiceService.getItemByItemCode(itemCode);
            return write(200, "请求成功", "data", serviceItems);
        } catch (Exception e) {
            return error(-1, e.getMessage());
        }
    }
}